Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .devcontainer
Submodule .devcontainer deleted from 85a4ae
1 change: 1 addition & 0 deletions .devcontainer
1 change: 1 addition & 0 deletions .externpro
Submodule .externpro added at ef5dae
4 changes: 2 additions & 2 deletions .github/release-tag.json
Original file line number Diff line number Diff line change
@@ -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"
}
6 changes: 3 additions & 3 deletions .github/workflows/xpbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/xprelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/xptag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule ".devcontainer"]
path = .devcontainer
[submodule ".externpro"]
path = .externpro
url = https://github.com/externpro/externpro
9 changes: 0 additions & 9 deletions CMakePresets.json

This file was deleted.

1 change: 1 addition & 0 deletions CMakePresets.json
2 changes: 1 addition & 1 deletion docker-compose.sh
2 changes: 1 addition & 1 deletion docker-compose.yml
5 changes: 1 addition & 4 deletions CMakePresetsBase.json → xpPresetsBase.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion xprodeps.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
|project|license [^_l]|description [dependencies]|version|source|diff [^_d]|
|-------|-------------|--------------------------|-------|------|----------|
|<a id='node-addon-api' />[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]|
|<a id='nodexp' />[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]|
|<a id='nodexp' />[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')

Expand Down
Loading