diff --git a/.devcontainer b/.devcontainer deleted file mode 160000 index 85a4aeb52..000000000 --- a/.devcontainer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 85a4aeb52826b1666e1ee1e2b24a5ff104e87583 diff --git a/.devcontainer b/.devcontainer new file mode 120000 index 000000000..666ad6fdd --- /dev/null +++ b/.devcontainer @@ -0,0 +1 @@ +.externpro \ No newline at end of file diff --git a/.externpro b/.externpro new file mode 160000 index 000000000..ef5daec7b --- /dev/null +++ b/.externpro @@ -0,0 +1 @@ +Subproject commit ef5daec7b22eec9408080b4871909ab1d3c17ef6 diff --git a/.github/release-tag.json b/.github/release-tag.json index 0afc7d02a..c2a0c0d91 100644 --- a/.github/release-tag.json +++ b/.github/release-tag.json @@ -1,4 +1,4 @@ { - "message": "xpro version 8.5.0.4 tag", - "tag": "xpv8.5.0.4" + "message": "xpro version 8.5.0.5 tag", + "tag": "xpv8.5.0.5" } diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 6478b7825..51c760998 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -14,18 +14,18 @@ jobs: contents: read pull-requests: write packages: write - uses: externpro/externpro/.github/workflows/build-linux.yml@26.01.4 + uses: externpro/externpro/.github/workflows/build-linux.yml@26.02.2 secrets: automation_token: ${{ secrets.GHCR_TOKEN }} with: cmake_workflow_preset_suffix: Release macos: - uses: externpro/externpro/.github/workflows/build-macos.yml@26.01.4 + uses: externpro/externpro/.github/workflows/build-macos.yml@26.02.2 secrets: inherit with: cmake_workflow_preset_suffix: Release windows: - uses: externpro/externpro/.github/workflows/build-windows.yml@26.01.4 + uses: externpro/externpro/.github/workflows/build-windows.yml@26.02.2 secrets: inherit with: cmake_workflow_preset_suffix: Release diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index bce26740a..70949943f 100644 --- a/.github/workflows/xprelease.yml +++ b/.github/workflows/xprelease.yml @@ -34,7 +34,7 @@ jobs: # Upload build artifacts as release assets release-from-build: if: github.event_name == 'workflow_dispatch' - uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01.4 + uses: externpro/externpro/.github/workflows/release-from-build.yml@26.02.2 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} permissions: diff --git a/.github/workflows/xptag.yml b/.github/workflows/xptag.yml index dcd402107..6d47e0cf6 100644 --- a/.github/workflows/xptag.yml +++ b/.github/workflows/xptag.yml @@ -8,7 +8,7 @@ on: jobs: tag: if: ${{ github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'xpro' && contains(github.event.pull_request.labels.*.name, 'release:tag') }} - uses: externpro/externpro/.github/workflows/tag-release.yml@26.01.4 + uses: externpro/externpro/.github/workflows/tag-release.yml@26.02.2 with: merge_sha: ${{ github.event.pull_request.merge_commit_sha }} pr_number: ${{ github.event.pull_request.number }} diff --git a/.gitmodules b/.gitmodules index 18932abfb..c17d455d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule ".devcontainer"] - path = .devcontainer +[submodule ".externpro"] + path = .externpro url = https://github.com/externpro/externpro diff --git a/CMakePresets.json b/CMakePresets.json deleted file mode 100644 index 28efa3978..000000000 --- a/CMakePresets.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "version": 8, - "include": [ - ".devcontainer/cmake/presets/xpLinuxNinja.json", - ".devcontainer/cmake/presets/xpDarwinNinja.json", - ".devcontainer/cmake/presets/xpMswVs2022.json", - ".devcontainer/cmake/presets/xpMswVs2026.json" - ] -} diff --git a/CMakePresets.json b/CMakePresets.json new file mode 120000 index 000000000..446b64a68 --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1 @@ +.externpro/cmake/presets/xpPresets.json \ No newline at end of file diff --git a/docker-compose.sh b/docker-compose.sh index 85f182f0b..ef704a987 120000 --- a/docker-compose.sh +++ b/docker-compose.sh @@ -1 +1 @@ -.devcontainer/compose.pro.sh \ No newline at end of file +.externpro/compose.pro.sh \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 46c1f8918..5a76e7e96 120000 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1 +1 @@ -.devcontainer/compose.bld.yml \ No newline at end of file +.externpro/compose.bld.yml \ No newline at end of file diff --git a/CMakePresetsBase.json b/xpPresetsBase.json similarity index 53% rename from CMakePresetsBase.json rename to xpPresetsBase.json index c54ade998..085cdc3e3 100644 --- a/CMakePresetsBase.json +++ b/xpPresetsBase.json @@ -4,10 +4,7 @@ { "name": "config-base", "hidden": true, - "binaryDir": "${sourceDir}/_bld-${presetName}", - "cacheVariables": { - "CMAKE_EXPERIMENTAL_GENERATE_SBOM": "ca494ed3-b261-4205-a01f-603c95e4cae0" - } + "binaryDir": "${sourceDir}/_bld-${presetName}" } ], "buildPresets": [ diff --git a/xprodeps.md b/xprodeps.md index a2cc323dc..4a7bd9910 100644 --- a/xprodeps.md +++ b/xprodeps.md @@ -3,7 +3,7 @@ |project|license [^_l]|description [dependencies]|version|source|diff [^_d]| |-------|-------------|--------------------------|-------|------|----------| |[node-addon-api](https://github.com/nodejs/node-addon-api)|[MIT](https://github.com/nodejs/node-addon-api/blob/v8.5.0/LICENSE.md 'MIT License')|Module for using N-API from C++ [deps: _nodexp_]| |[upstream](https://github.com/nodejs/node-addon-api 'github.com/nodejs/node-addon-api')| [intro]| -|[nodexp](https://nodejs.org/en/blog/release/v22.19.0/)|[MIT](https://raw.githubusercontent.com/nodejs/node/v22.19.0/LICENSE 'MIT License')|node/npm development platform and runtime executable bundled as externpro devel package to build addons|[xpv22.19.0.4](https://github.com/externpro/nodexp/releases/tag/xpv22.19.0.4 'release')|[repo](https://github.com/externpro/nodexp 'github.com/externpro/nodexp')|[diff](https://github.com/externpro/nodexp/compare/v0...xpv22.19.0.4 'github.com/externpro/nodexp/compare/v0...xpv22.19.0.4') [bin]| +|[nodexp](https://nodejs.org/en/blog/release/v22.19.0/)|[MIT](https://raw.githubusercontent.com/nodejs/node/v22.19.0/LICENSE 'MIT License')|node/npm development platform and runtime executable bundled as xpro package to build addons|[xpv22.19.0.5](https://github.com/externpro/nodexp/releases/tag/xpv22.19.0.5 'release')|[repo](https://github.com/externpro/nodexp 'github.com/externpro/nodexp')|[diff](https://github.com/externpro/nodexp/compare/v0...xpv22.19.0.5 'github.com/externpro/nodexp/compare/v0...xpv22.19.0.5') [bin]| ![deps](xprodeps.svg 'dependencies')