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

[DOC] Update upgrade considerations for 2.7 #4558

Conversation

knylander-grafana
Copy link
Contributor

What this PR does:

Updates the Upgrade considerations for 2.7 release notes and Upgrade pages.

Which issue(s) this PR fixes:
Fixes #

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Copy link
Contributor

This PR must be merged before a backport PR will be created.

@knylander-grafana knylander-grafana merged commit b7fbc75 into grafana:main Jan 15, 2025
19 of 20 checks passed
Copy link
Contributor

The backport to release-v2.7 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 branch
git switch --create backport-4558-to-release-v2.7 origin/release-v2.7
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x b7fbc75fd91d6110be3e510cabd51d26de44038e

When the conflicts are resolved, stage and commit the changes:

git add . && git cherry-pick --continue

If you have the GitHub CLI installed:

# Push the branch to GitHub:
git push --set-upstream origin backport-4558-to-release-v2.7
# Create the PR body template
PR_BODY=$(gh pr view 4558 --json body --template 'Backport b7fbc75fd91d6110be3e510cabd51d26de44038e from #4558{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[release-v2.7] [DOC] Update upgrade considerations for 2.7' --body-file - --label 'type/docs' --label 'backport' --base release-v2.7 --milestone release-v2.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-4558-to-release-v2.7

# Create a pull request where the `base` branch is `release-v2.7` and the `compare`/`head` branch is `backport-4558-to-release-v2.7`.

# Remove the local backport branch
git switch main
git branch -D backport-4558-to-release-v2.7

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-v2.7 Backport for V2.7 backport-failed type/docs Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants