-
Notifications
You must be signed in to change notification settings - Fork 605
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
Test backport workflow with branch that doesn't make a GraphQL call #3551
Test backport workflow with branch that doesn't make a GraphQL call #3551
Conversation
For more information, refer to grafana/grafana-github-actions#224. Signed-off-by: Jack Baldry <[email protected]>
61e41f2
to
5de1854
Compare
Hello @aleks-p!
Please, if the current pull request addresses a bug fix, label it with the |
This PR must be merged before a backport PR will be created. |
…3551) For more information, refer to grafana/grafana-github-actions#224. Signed-off-by: Jack Baldry <[email protected]> (cherry picked from commit 6819c91)
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new branch
git switch --create backport-3551-to-release/v1.7 origin/release/v1.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 6819c91e159153ec52cb4ce88ec73e5b88511f73 When the conflicts are resolved, stage and commit the changes:
If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-3551-to-release/v1.7
# Create the PR body template
PR_BODY=$(gh pr view 3551 --json body --template 'Backport 6819c91e159153ec52cb4ce88ec73e5b88511f73 from #3551{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release/v1.7] Test backport workflow with branch that doesn't make a GraphQL call' --body-file - --label 'type/ci' --label 'backport' --base release/v1.7 --milestone release/v1.7 --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # Push the branch to GitHub:
git push --set-upstream origin backport-3551-to-release/v1.7
# Create a pull request where the `base` branch is `release/v1.7` and the `compare`/`head` branch is `backport-3551-to-release/v1.7`.
# Remove the local backport branch
git switch main
git branch -D backport-3551-to-release/v1.7 |
For more information, refer to grafana/grafana-github-actions#224.
I'd like to try backporting this to at least one release branch to check if it behaves correctly.