From db00a7e7bad8215eb4da2ae3e5eb9ca97788807a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 3 Nov 2026 20:52:50 +0000 Subject: [PATCH 1/5] migrate externpro submodule .devcontainer -> .externpro --- .devcontainer | 2 +- .gitmodules | 4 ++-- docker-compose.sh | 2 +- docker-compose.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) mode change 160000 => 120000 .devcontainer diff --git a/.devcontainer b/.devcontainer deleted file mode 160000 index c634276..0000000 --- a/.devcontainer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c634276f7d0da765a81f8abcce433ea5546d64f6 diff --git a/.devcontainer b/.devcontainer new file mode 120000 index 0000000..666ad6f --- /dev/null +++ b/.devcontainer @@ -0,0 +1 @@ +.externpro \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 18932ab..c17d455 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/docker-compose.sh b/docker-compose.sh index 85f182f..ef704a9 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 46c1f89..5a76e7e 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 From af375508b6b447a73d094b3fd9d6b8222e15a5ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 3 Nov 2026 20:52:50 +0000 Subject: [PATCH 2/5] externpro 26.02.4 --- .externpro | 1 + 1 file changed, 1 insertion(+) create mode 160000 .externpro diff --git a/.externpro b/.externpro new file mode 160000 index 0000000..f88ab78 --- /dev/null +++ b/.externpro @@ -0,0 +1 @@ +Subproject commit f88ab7811ad9fe6057f0c20a2ced4184a81abc35 From 7d8f120ce07bc3778e148457a0d2dc48bf28af7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 3 Nov 2026 20:52:50 +0000 Subject: [PATCH 3/5] sync GitHub Actions workflows --- .github/workflows/xpbuild.yml | 2 +- .github/workflows/xprelease.yml | 2 +- .github/workflows/xptag.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/xpbuild.yml b/.github/workflows/xpbuild.yml index 867f1af..dfe9ab8 100644 --- a/.github/workflows/xpbuild.yml +++ b/.github/workflows/xpbuild.yml @@ -14,7 +14,7 @@ jobs: contents: read pull-requests: write packages: write - uses: externpro/externpro/.github/workflows/build-linux.yml@26.01.5 + uses: externpro/externpro/.github/workflows/build-linux.yml@26.02.4 secrets: automation_token: ${{ secrets.GHCR_TOKEN }} with: diff --git a/.github/workflows/xprelease.yml b/.github/workflows/xprelease.yml index b78b96f..b5816ef 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.5 + uses: externpro/externpro/.github/workflows/release-from-build.yml@26.02.4 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 1f6b019..1fd34da 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.5 + uses: externpro/externpro/.github/workflows/tag-release.yml@26.02.4 with: merge_sha: ${{ github.event.pull_request.merge_commit_sha }} pr_number: ${{ github.event.pull_request.number }} From eec59db11f157599bf78e2991e21b60d7801d32b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 3 Nov 2026 20:52:50 +0000 Subject: [PATCH 4/5] sync cmake presets --- CMakePresets.json | 10 +--------- CMakePresetsBase.json => xpPresetsBase.json | 0 2 files changed, 1 insertion(+), 9 deletions(-) mode change 100644 => 120000 CMakePresets.json rename CMakePresetsBase.json => xpPresetsBase.json (100%) diff --git a/CMakePresets.json b/CMakePresets.json deleted file mode 100644 index 28efa39..0000000 --- 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 0000000..446b64a --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1 @@ +.externpro/cmake/presets/xpPresets.json \ No newline at end of file diff --git a/CMakePresetsBase.json b/xpPresetsBase.json similarity index 100% rename from CMakePresetsBase.json rename to xpPresetsBase.json From 9e3c8d0c5469534248340e60b6e7e684ebdfdde6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 3 Nov 2026 20:52:50 +0000 Subject: [PATCH 5/5] update .github/release-tag.json --- .github/release-tag.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/release-tag.json b/.github/release-tag.json index dc35922..f9f9578 100644 --- a/.github/release-tag.json +++ b/.github/release-tag.json @@ -1,4 +1,4 @@ { - "message": "xpro version 21.09.06.5 tag", - "tag": "xpv21.09.06.5" + "message": "xpro version 21.09.06.6 tag", + "tag": "xpv21.09.06.6" }