From 2998ce7404f1b5e9127c7ceb101cf60a6befd32e Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 2 Dec 2025 17:13:35 -0700 Subject: [PATCH 1/4] externpro 25.06.1-7-g1d90efb --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index d778368c70b3..1d90efbd8f07 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit d778368c70b3d147f0487c844e260373f29334d1 +Subproject commit 1d90efbd8f07dfe7eaee2db2585b5ff214d7f615 From 9a76bd739ac42ba884b4be6e20c5957eb64387c7 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Tue, 2 Dec 2025 17:16:12 -0700 Subject: [PATCH 2/4] github/workflows/xpbuild: copy .devcontainer/.github/wf-templates/ --- .github/workflows/xpbuild.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 33ec5df0308c..bf31482e5de4 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -1,4 +1,7 @@ name: Build +permissions: + contents: read + pull-requests: write on: push: branches: [ "dev" ] @@ -7,24 +10,21 @@ on: workflow_dispatch: jobs: linux: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.06 + permissions: + contents: read + pull-requests: write + packages: write + uses: externpro/externpro/.github/workflows/build-linux.yml@main with: - cmake-workflow-preset: LinuxRelease - runon: ubuntu-latest - secrets: inherit - linux-arm64: - uses: externpro/externpro/.github/workflows/build-linux.yml@25.06 - with: - cmake-workflow-preset: LinuxRelease - runon: ubuntu-24.04-arm + cmake-workflow-preset: Linux secrets: inherit macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@25.06 + uses: externpro/externpro/.github/workflows/build-macos.yml@main with: - cmake-workflow-preset: DarwinRelease + cmake-workflow-preset: Darwin secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.06 + uses: externpro/externpro/.github/workflows/build-windows.yml@main with: - cmake-workflow-preset: WindowsRelease + cmake-workflow-preset: Windows secrets: inherit From 1111426d2204ae3633fd068d6a6d40272db056f8 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 11 Dec 2025 19:35:36 -0700 Subject: [PATCH 3/4] github/workflows/xpbuild: cmake-workflow-preset Release --- .github/workflows/xpbuild.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index bf31482e5de4..76bd3cd14e04 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -16,15 +16,15 @@ jobs: packages: write uses: externpro/externpro/.github/workflows/build-linux.yml@main with: - cmake-workflow-preset: Linux + cmake-workflow-preset: LinuxRelease secrets: inherit macos: uses: externpro/externpro/.github/workflows/build-macos.yml@main with: - cmake-workflow-preset: Darwin + cmake-workflow-preset: DarwinRelease secrets: inherit windows: uses: externpro/externpro/.github/workflows/build-windows.yml@main with: - cmake-workflow-preset: Windows + cmake-workflow-preset: WindowsRelease secrets: inherit From af94886a179c79b4dd2a71dba9920ebd12ac6714 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Thu, 11 Dec 2025 20:27:26 -0700 Subject: [PATCH 4/4] cmake: use xpExternPackage cmake func --- tools/cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cmake b/tools/cmake index 411b8dd57360..b0e7973d4026 160000 --- a/tools/cmake +++ b/tools/cmake @@ -1 +1 @@ -Subproject commit 411b8dd5736036176a5b51408e6a3c62cd82aab4 +Subproject commit b0e7973d4026a8d29d8db9599f0f19a35c84d7d0