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

docs: Update release notes for 3.2.1 #14537

Merged
merged 1 commit into from
Oct 18, 2024

Conversation

JStickler
Copy link
Contributor

What this PR does / why we need it:

Updates the 3.2 Release notes for 3.1.2 and 3.2.1 releases.

@JStickler JStickler added type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories backport release-3.2.x labels Oct 18, 2024
@JStickler JStickler requested a review from a team as a code owner October 18, 2024 17:45
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Oct 18, 2024

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

1 similar comment
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Oct 18, 2024

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

@JStickler JStickler merged commit 30f04ca into grafana:main Oct 18, 2024
66 of 67 checks passed
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Oct 18, 2024

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

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-14537-to-release-3.2.x
# Create the PR body template
PR_BODY=$(gh pr view 14537 --json body --template 'Backport 30f04cabb016af945ac2849b7a8717a8e423f893 from #14537{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'docs: Update release notes for 3.2.1 (backport release-3.2.x)' --body-file - --label 'size/S' --label 'type/docs' --label 'backport' --base release-3.2.x --milestone release-3.2.x --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-14537-to-release-3.2.x

# Create a pull request where the `base` branch is `release-3.2.x` and the `compare`/`head` branch is `backport-14537-to-release-3.2.x`.

# Remove the local backport branch
git switch main
git branch -D backport-14537-to-release-3.2.x

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3.2.x backport-failed size/S type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants