diff --git a/.devcontainer b/.devcontainer index 8e40eae..c634276 160000 --- a/.devcontainer +++ b/.devcontainer @@ -1 +1 @@ -Subproject commit 8e40eae2614ccbe5c4116e108e76bb0ba3d41b37 +Subproject commit c634276f7d0da765a81f8abcce433ea5546d64f6 diff --git a/.github/release-tag.json b/.github/release-tag.json index d2ef811..dc35922 100644 --- a/.github/release-tag.json +++ b/.github/release-tag.json @@ -1,4 +1,4 @@ { - "message": "xpro version 21.09.06.4 tag", - "tag": "xpv21.09.06.4" + "message": "xpro version 21.09.06.5 tag", + "tag": "xpv21.09.06.5" } diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 8406db3..867f1af 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -14,11 +14,11 @@ jobs: contents: read pull-requests: write packages: write - uses: externpro/externpro/.github/workflows/build-linux.yml@25.07.12 + uses: externpro/externpro/.github/workflows/build-linux.yml@26.01.5 secrets: automation_token: ${{ secrets.GHCR_TOKEN }} with: - artifact_pattern: "${{ github.event.repository.name }}-*.rpm" - cmake_workflow_preset: LinuxRelease arch_list: '["amd64"]' + artifact_pattern: "${{ github.event.repository.name }}-*.rpm" buildpro_images: '["rocky9-gcc13"]' + cmake_workflow_preset_suffix: Release diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index c0f0365..b78b96f 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@25.07.12 + uses: externpro/externpro/.github/workflows/release-from-build.yml@26.01.5 with: workflow_run_url: ${{ github.event.inputs.workflow_run_url }} artifact_pattern: "*.rpm" diff --git a/.github/workflows/xptag.yml b/.github/workflows/xptag.yml index 2586eaf..1f6b019 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@25.07.12 + uses: externpro/externpro/.github/workflows/tag-release.yml@26.01.5 with: merge_sha: ${{ github.event.pull_request.merge_commit_sha }} pr_number: ${{ github.event.pull_request.number }} diff --git a/CMakePresets.json b/CMakePresets.json index 621cce6..28efa39 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -1,6 +1,9 @@ { "version": 8, "include": [ - ".devcontainer/cmake/presets/xpLinuxNinja.json" + ".devcontainer/cmake/presets/xpLinuxNinja.json", + ".devcontainer/cmake/presets/xpDarwinNinja.json", + ".devcontainer/cmake/presets/xpMswVs2022.json", + ".devcontainer/cmake/presets/xpMswVs2026.json" ] }