Skip to content

v1.15.3 rebase#8

Merged
smanders merged 6 commits intoxprofrom
v1.15.3_rebase
Apr 1, 2026
Merged

v1.15.3 rebase#8
smanders merged 6 commits intoxprofrom
v1.15.3_rebase

Conversation

@smanders
Copy link
Copy Markdown

@smanders smanders commented Apr 1, 2026

steps done locally

git switch xpro
git branch backup/xpro-before-squash
git reset --soft v1.15.3
git restore --staged .
git checkout -b v1.15.3_rebase
git add .devcontainer .gitmodules
cd .devcontainer
git describe --tags
git describe --tags | pbcopy
cd ..
git commit -m "externpro 25.07.17-3-ga5a7aaf"
git add .github/workflows/xp* .github/release-tag.json
git add CMakePresets* docker-compose.*
git add xprodeps.*
git commit -m "externpro init"
git add -p .github/workflows
git commit -m "upstream workflows, on: workflow_dispatch"
git add -p .gitignore
git commit -m "gitignore: add externpro ignores"
git add -p
git commit -m "CMakeLists.txt: xproinc, xpExternPackage"
git diff --exit-code xpv1.15.3.5 HEAD
git diff v1.15.3..xpv1.15.3.5 | git patch-id --stable; git diff v1.15.3..HEAD | git patch-id --stable
diff -u \\n<(git diff v1.15.3..xpv1.15.3.5) \\n<(git diff v1.15.3..HEAD)
<bump version in .github/release-tag.json>
git commit -m "release-tag: xpv1.15.3.6" .github/release-tag.json
git push cm v1.15.3_rebase 
diff -u \\n<(git diff v1.15.3..xpv1.15.3.5) \\n<(git diff v1.15.3..HEAD)
git push --force-with-lease cm xpro 

@smanders smanders added the release:tag Tag release on merge label Apr 1, 2026
@smanders smanders merged commit c68038e into xpro Apr 1, 2026
22 checks passed
@smanders smanders deleted the v1.15.3_rebase branch April 1, 2026 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

release:tag Tag release on merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant