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

Upgrade dskit #10249

Merged
merged 2 commits into from
Aug 15, 2023
Merged

Upgrade dskit #10249

merged 2 commits into from
Aug 15, 2023

Conversation

charleskorn
Copy link
Contributor

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

  • Reviewed the CONTRIBUTING.md guide (required)
  • [n/a] Documentation added
  • [n/a] Tests updated
  • [n/a] CHANGELOG.md updated
    • [n/a] If the change is worth mentioning in the release notes, add add-to-release-notes label
  • [n/a] Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • [n/a] For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR

@charleskorn charleskorn marked this pull request as ready for review August 15, 2023 03:47
@charleskorn charleskorn requested a review from a team as a code owner August 15, 2023 03:47
@charleskorn
Copy link
Contributor Author

Test failure seems unrelated: same failure happened for most recent main build: https://drone.grafana.net/grafana/loki/26406/3/4

@dannykopping
Copy link
Contributor

Thanks @charleskorn 👍 restarting the build; let's see if it's a transient error

@dannykopping
Copy link
Contributor

OK looks like it got a little further now.

@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Aug 15, 2023
@dannykopping dannykopping merged commit 611481b into main Aug 15, 2023
3 checks passed
@dannykopping dannykopping deleted the charleskorn/dskit-upgrade branch August 15, 2023 06:19
@grafanabot
Copy link
Collaborator

The backport to release-2.9.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-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 base branch is release-2.9.x and the compare/head branch is backport-10249-to-release-2.9.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-failed size/M 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.

4 participants