From d5d0699602b04af2f6e13a526429aa05fe77825f Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 16 Aug 2025 15:16:00 -0600 Subject: [PATCH 1/4] externpro github/workflows @25.05 --- .github/workflows/{build.yml => xpbuild.yml} | 6 +++--- .github/workflows/{release.yml => xprelease.yml} | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) rename .github/workflows/{build.yml => xpbuild.yml} (96%) rename .github/workflows/{release.yml => xprelease.yml} (84%) diff --git a/.github/workflows/build.yml b/.github/workflows/xpbuild.yml similarity index 96% rename from .github/workflows/build.yml rename to .github/workflows/xpbuild.yml index 3b34b65..861392f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/xpbuild.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.05 with: cmake-workflow-preset: LinuxRelease 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.05 with: cmake-workflow-preset: LinuxRelease 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.05 with: cmake-workflow-preset: WindowsRelease secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/xprelease.yml similarity index 84% rename from .github/workflows/release.yml rename to .github/workflows/xprelease.yml index 6fa033b..5d9a5b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/xprelease.yml @@ -9,8 +9,12 @@ 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.05 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} artifact_pattern: "*.tar.xz" + permissions: + contents: write + id-token: write + attestations: write secrets: inherit From 6e43aa23cb4ab3083f0698f643880b45ef0a3550 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 16 Aug 2025 15:16:32 -0600 Subject: [PATCH 2/4] externpro 25.05-12-g4877bad --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index de12dc2..4877bad 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit de12dc208298d0090a6e9efadf9eafd6018a549c +Subproject commit 4877bada4c11fe25ff71a3f995960b47a5973eb9 From e2a3921555d3908462f30221c4dc29477a4b1221 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 16 Aug 2025 15:17:10 -0600 Subject: [PATCH 3/4] CMakePresets: include xpDarwinNinja --- CMakePresets.json | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakePresets.json b/CMakePresets.json index 5a06690..f82cfdd 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -2,6 +2,7 @@ "version": 8, "include": [ ".devcontainer/cmake/presets/xpLinuxNinja.json", + ".devcontainer/cmake/presets/xpDarwinNinja.json", ".devcontainer/cmake/presets/xpWindowsVs2022.json" ] } From c90781e08607a12b4a581119ea84f6207ff711bf Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Sat, 16 Aug 2025 15:18:06 -0600 Subject: [PATCH 4/4] github/workflows: build with macos job --- .github/workflows/xpbuild.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 861392f..d79be62 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -18,6 +18,11 @@ jobs: cmake-workflow-preset: LinuxRelease runon: ubuntu-24.04-arm secrets: inherit + macos: + uses: externpro/externpro/.github/workflows/build-macos.yml@main + with: + cmake-workflow-preset: DarwinRelease + secrets: inherit windows: uses: externpro/externpro/.github/workflows/build-windows.yml@25.05 with: