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

Update golang version to 1.21.11 #3365

Merged
merged 1 commit into from
Jun 19, 2024

Conversation

simonswine
Copy link
Contributor

No description provided.

@simonswine simonswine added backport release/v1.6 type/bug Something isn't working labels Jun 19, 2024
Copy link
Contributor

Hello @simonswine!
Backport pull requests need to be either:

  • Pull requests which address bugs,
  • Urgent fixes which need product approval, in order to get merged,
  • Docs changes.

Please, if the current pull request addresses a bug fix, label it with the type/bug label.
If it already has the product approval, please add the product-approved label. For docs changes, please add the type/docs label.
If the pull request modifies CI behaviour, please add the type/ci label.
If none of the above applies, please consider removing the backport label and target the next major/minor release.
Thanks!

Copy link
Contributor

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

Copy link
Collaborator

@korniltsev korniltsev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

@simonswine simonswine marked this pull request as ready for review June 19, 2024 12:25
@simonswine simonswine requested a review from a team as a code owner June 19, 2024 12:25
@simonswine simonswine added type/bug Something isn't working and removed type/bug Something isn't working missing-labels labels Jun 19, 2024
Copy link
Contributor

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

@simonswine simonswine merged commit fd207b1 into grafana:main Jun 19, 2024
19 checks passed
Copy link
Contributor

The backport to release/v1.6 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-3365-to-release/v1.6 origin/release/v1.6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x fd207b19b46dfe03a0466a8238639958bfa8eeab

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-3365-to-release/v1.6
# Create the PR on GitHub
gh pr create --title '[release/v1.6] Update golang version to 1.21.11' --body 'Backport fd207b19b46dfe03a0466a8238639958bfa8eeab from #3365' --label 'type/bug' --label 'backport' --base release/v1.6 --milestone release/v1.6 --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-3365-to-release/v1.6

# Create a pull request where the `base` branch is `release/v1.6` and the `compare`/`head` branch is `backport-3365-to-release/v1.6`.

# Remove the local backport branch
git switch main
git branch -D backport-3365-to-release/v1.6

simonswine added a commit that referenced this pull request Jun 21, 2024
simonswine added a commit that referenced this pull request Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-failed type/bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants