-
Notifications
You must be signed in to change notification settings - Fork 3.5k
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
Upgrade dskit #10249
Upgrade dskit #10249
Conversation
Test failure seems unrelated: same failure happened for most recent |
Thanks @charleskorn 👍 restarting the build; let's see if it's a transient error |
OK looks like it got a little further now. |
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-10249-to-release-2.9.x origin/release-2.9.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x 611481b6cfaff4b7454ea655e3543026778a9927
# When the conflicts are resolved, stage and commit the changes
git add . && git cherry-pick --continue If you have the GitHub CLI installed: # Create the PR body template
PR_BODY=$(gh pr view 10249 --json body --template 'Backport 611481b6cfaff4b7454ea655e3543026778a9927 from #10249{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Push the branch to GitHub and a PR
echo "${PR_BODY}" | gh pr create --title "[release-2.9.x] Upgrade dskit" --body-file - --label "size/M" --label "type/docs" --label "product-approved" --label "backport" --base release-2.9.x --milestone release-2.9.x --web Or, if you don't have the GitHub CLI installed (we recommend you install it!): # If you don't have the GitHub CLI installed: Push the branch to GitHub and manually create a PR:
git push --set-upstream origin backport-10249-to-release-2.9.x
# Remove the local backport branch
git switch main
git branch -D backport-10249-to-release-2.9.x Unless you've used the GitHub CLI above, now create a pull request where the |
What this PR does / why we need it:
This PR upgrades dskit to fix a breaking change, grafana/dskit#357.
Which issue(s) this PR fixes:
(none)
Special notes for your reviewer:
Checklist
CONTRIBUTING.md
guide (required)CHANGELOG.md
updatedadd-to-release-notes
labeldocs/sources/setup/upgrade/_index.md
production/helm/loki/Chart.yaml
and updateproduction/helm/loki/CHANGELOG.md
andproduction/helm/loki/README.md
. Example PR