From 0523d0220817e71002f371fa03ed92845b3c9acf Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 19 Sep 2025 21:18:19 -0600 Subject: [PATCH 1/4] externpro 25.05.1-70-ga977160 --- .devcontainer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer b/.devcontainer index de423b450..a97716088 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit de423b4502cdd4d82b968dfb42ddbead89936644 +Subproject commit a97716088a3e37cac313915326792a614674ba1c From 174e4ad7f216db806dfcd80921790e77a52e1a46 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 19 Sep 2025 21:19:28 -0600 Subject: [PATCH 2/4] externpro github/workflows @25.05.1 git mv .github/workflows/build.yml .github/workflows/xpbuild.yml git mv .github/workflows/release.yml .github/workflows/xprelease.yml cp .devcontainer/.github/wf-templates/xp*.yml .github/workflows cmake-workflow-preset for each platform/os set to Release --- .github/workflows/{build.yml => xpbuild.yml} | 11 ++++++++--- .github/workflows/{release.yml => xprelease.yml} | 6 +++++- 2 files changed, 13 insertions(+), 4 deletions(-) rename .github/workflows/{build.yml => xpbuild.yml} (77%) rename .github/workflows/{release.yml => xprelease.yml} (83%) diff --git a/.github/workflows/build.yml b/.github/workflows/xpbuild.yml similarity index 77% rename from .github/workflows/build.yml rename to .github/workflows/xpbuild.yml index 3b34b6558..fb5575822 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/xpbuild.yml @@ -7,19 +7,24 @@ 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.1 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.1 with: cmake-workflow-preset: LinuxRelease runon: ubuntu-24.04-arm secrets: inherit + macos: + uses: externpro/externpro/.github/workflows/build-macos.yml@25.05.1 + with: + cmake-workflow-preset: DarwinRelease + secrets: inherit windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@25.04 + uses: externpro/externpro/.github/workflows/build-windows.yml@25.05.1 with: cmake-workflow-preset: WindowsRelease secrets: inherit diff --git a/.github/workflows/release.yml b/.github/workflows/xprelease.yml similarity index 83% rename from .github/workflows/release.yml rename to .github/workflows/xprelease.yml index 6fa033bc0..f868a82e5 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.1 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 ce176dd0f60fd3f4d452e8fe65533d3d22f958f9 Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 19 Sep 2025 21:20:12 -0600 Subject: [PATCH 3/4] CMakePresets: include xpDarwinNinja (for macOS) cp .devcontainer/cmake/presets/CMakePresets.json . --- CMakePresets.json | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakePresets.json b/CMakePresets.json index 5a0669048..f82cfdd2c 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 4b4dd5cc0a4c0859afc9d060f2f08f883efb8fff Mon Sep 17 00:00:00 2001 From: Scott M Anderson Date: Fri, 19 Sep 2025 21:21:07 -0600 Subject: [PATCH 4/4] cmake toplevel updates * externpro as dependency provider (xproinc) * project VERSION matches official/upstream version * no longer using 4th digit for externpro-specific version * externpro devel package gets version from 'git describe --tags' * externpro flags.cmake renamed to xpflags.cmake --- CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bdfe63754..0b7c172fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,7 @@ cmake_minimum_required(VERSION 3.31) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake) -include(preproject) -project(node-addon-api VERSION 3.0.2.2) -include(flags) +set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake) +project(node-addon-api VERSION 3.0.2) +include(xpflags) include(GNUInstallDirs) set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake) # xpPackageDevel set(XP_NAMESPACE xpro)