Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automate the version bump workflow #457

Merged
merged 1 commit into from
Dec 1, 2023

Conversation

Xtansia
Copy link
Collaborator

@Xtansia Xtansia commented Dec 1, 2023

Description

Automates the version bump workflow so that it will create PRs into the relevant version branches when a new version tag is pushed. As well as creating the {major}.x and/or {major}.{minor} branches when a v{major}.0.0 or v{major}.{minor}.0 tag is pushed.

Additionally removes one of the hardcoded versions out of a workflow and has it read from elsewhere, so that version bump workflow doesn't need "modify workflow" permission to bump the version.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@dblock dblock merged commit ee30560 into opensearch-project:main Dec 1, 2023
43 checks passed
@Xtansia Xtansia deleted the feat/auto-version-bump branch December 1, 2023 22:01
@Xtansia Xtansia added the backport 1.x Backport to 1.x branch label Dec 1, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 1.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.x 1.x
# Navigate to the new working tree
cd .worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-457-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ee30560d6688912bc728dbb0b052a67be4c898ac
# Push it to GitHub
git push --set-upstream origin backport/backport-457-to-1.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.x

Then, create a pull request where the base branch is 1.x and the compare/head branch is backport/backport-457-to-1.x.

Xtansia added a commit to Xtansia/opensearch-net that referenced this pull request Dec 1, 2023
Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit ee30560)
dblock pushed a commit that referenced this pull request Dec 4, 2023
Signed-off-by: Thomas Farr <[email protected]>
(cherry picked from commit ee30560)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.x Backport to 1.x branch skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants