From 6d0f29c4cb4c59c1efb2a6babfd64b984e6f872e Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 21 Jul 2025 22:48:19 -0600 Subject: [PATCH 1/8] externpro 24.05 https://github.com/externpro/externpro/releases/tag/25.04 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 313d502..de12dc2 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 313d502797c9d5315bfb67d4b1cfe5fab58f509b +Subproject commit de12dc208298d0090a6e9efadf9eafd6018a549c From 4cad765ce4d4031b14e9b53d690682302b4753e4 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 21 Jul 2025 22:49:22 -0600 Subject: [PATCH 2/8] update docker-compose links --- docker-compose.sh | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.sh b/docker-compose.sh index 57f36db..85f182f 120000 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -1 +1 @@ -.devcontainer/compose.bld.sh \ No newline at end of file +.devcontainer/compose.pro.sh \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 7e6cc2e..46c1f89 120000 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1 +1 @@ -.devcontainer/compose.pro.yml \ No newline at end of file +.devcontainer/compose.bld.yml \ No newline at end of file From 6ee41a4e49da1a32e41729a9be38247729448734 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 21 Jul 2025 22:52:19 -0600 Subject: [PATCH 3/8] update .gitignore to track .github/ --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 28233dc..1dc0e94 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,10 @@ # ignore all subdirectories **/ -# Exclude specific subdirectories/dotfiles to track +# track .devcontainer, .github directory, and contents !.devcontainer +!.github +!.github/* # externpro .env From 993d6cc9992532f2ba65a3ee19515a7582f5c589 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 21 Jul 2025 23:04:42 -0600 Subject: [PATCH 4/8] externpro/.github/workflows @25.04 --- .github/workflows/build.yml | 25 +++++++++++++++++++++++++ .github/workflows/release.yml | 16 ++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..33dce81 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,25 @@ +name: Build +on: + push: + branches: [ "dev" ] + pull_request: + branches: [ "dev" ] + workflow_dispatch: +jobs: + linux: + uses: externpro/externpro/.github/workflows/build-linux.yml@25.04 + with: + cmake-workflow-preset: Linux + runon: ubuntu-latest + secrets: inherit + linux-arm64: + uses: externpro/externpro/.github/workflows/build-linux.yml@25.04 + with: + cmake-workflow-preset: Linux + runon: ubuntu-24.04-arm + secrets: inherit + windows: + uses: externpro/externpro/.github/workflows/build-windows.yml@25.04 + with: + cmake-workflow-preset: Windows + secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..6fa033b --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,16 @@ +name: Release +on: + workflow_dispatch: + inputs: + workflow_run_url: + description: 'URL of the workflow run containing artifacts to upload (e.g., https://github.com/owner/repo/actions/runs/123456789)' + required: true + type: string +jobs: + # Upload build artifacts as release assets + release-from-build: + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.04 + with: + workflow_run_url: ${{ github.event.inputs.workflow_run_url }} + artifact_pattern: "*.tar.xz" + secrets: inherit From 4fc4ab4d164f04bfb2c2fe2709b1bbdedeceba49 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 21 Jul 2025 23:06:55 -0600 Subject: [PATCH 5/8] CMakePresets: change Vs2019 to Vs2022 --- CMakePresets.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index b168c95..5a06690 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -2,6 +2,6 @@ "version": 8, "include": [ ".devcontainer/cmake/presets/xpLinuxNinja.json", - ".devcontainer/cmake/presets/xpWindowsVs2019.json" + ".devcontainer/cmake/presets/xpWindowsVs2022.json" ] } From 642138b74a7fd61a824030d8976102242cbbe160 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 21 Jul 2025 23:07:22 -0600 Subject: [PATCH 6/8] cmake 3.31 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 715ca50..de62910 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.28) +cmake_minimum_required(VERSION 3.31) list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) include(preproject) project(SQLite3 From f50659acdd5a8daf7959f1d381970162bc54019b Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 21 Jul 2025 23:07:45 -0600 Subject: [PATCH 7/8] cmake: buildpro_REV set in .devcontainer/cmake/xptoplevel.cmake --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index de62910..1b78427 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,6 @@ include(GNUInstallDirs) #------------------------------------------------------------------------------ # externpro -set(buildpro_REV 24.07) include(flags) if(NOT DEFINED XP_NAMESPACE) set(XP_NAMESPACE SQLite) From 89d41e895f132be7d6b3df33c0a3df0b6a6358fc Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Mon, 21 Jul 2025 23:12:49 -0600 Subject: [PATCH 8/8] externpro/.github/workflows @25.04.2 --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33dce81..b120831 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,19 +7,19 @@ on: workflow_dispatch: jobs: linux: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.04 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.04.2 with: cmake-workflow-preset: Linux runon: ubuntu-latest secrets: inherit linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.04 + uses: externpro/externpro/.github/workflows/build-linux.yml@25.04.2 with: cmake-workflow-preset: Linux runon: ubuntu-24.04-arm secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.04 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.04.2 with: cmake-workflow-preset: Windows secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6fa033b..598ccec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ on: jobs: # Upload build artifacts as release assets release-from-build: - uses: externpro/externpro/.github/workflows/release-from-build.yml@25.04 + uses: externpro/externpro/.github/workflows/release-from-build.yml@25.04.2 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} artifact_pattern: "*.tar.xz"