From 3c20b42103b7d535565548cc09f5bfbf1918911d Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 22 Jul 2025 11:54:33 -0600 Subject: [PATCH 1/5] externpro 25.04.2-16-gb2b8610 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index 6c48d72..b2b8610 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 6c48d72a90ee192f09b2736dbb8faf80949fa9bd +Subproject commit b2b86105482f508103a8c91c357e48bc79f598ae From 5e67a0830a4bad6e495f5e9a43872078791e92f1 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 22 Jul 2025 11:55:18 -0600 Subject: [PATCH 2/5] 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 2ed278bfb07a9019702343742ca2a29ab0ab031e Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 22 Jul 2025 11:56:40 -0600 Subject: [PATCH 3/5] 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 2551d4c33f8da716e62e6e3f3faa7b33b9f8dfc8 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 22 Jul 2025 11:57:09 -0600 Subject: [PATCH 4/5] 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 75645ceb01604f12135b93b8470be119affa8219 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 22 Jul 2025 11:58:49 -0600 Subject: [PATCH 5/5] cmake 3.31 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 93ce28d..45d84141 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.28) +cmake_minimum_required(VERSION 3.31) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake ${CMAKE_CURRENT_LIST_DIR}/cmake) include(preproject) project(libspatialite VERSION 5.1.0.3)