fix: Update dskit to fix linux/arm build - #18715
Merged
Merged
Conversation
fcjack
approved these changes
Aug 4, 2025
salvacorts
enabled auto-merge (squash)
August 4, 2025 15:03
salvacorts
force-pushed
the
salvacorts/fix-32bits-build-dskit
branch
from
August 4, 2025 15:08
93ca517 to
3da8901
Compare
Contributor
|
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-18715-to-k266 origin/k266
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x f39fc1e6e623bc88bf4d5d8e2e0c2ca039f5967fWhen the conflicts are resolved, stage and commit the changes: If you have the GitHub CLI installed: # Push the branch to GitHub:
git push --set-upstream origin backport-18715-to-k266
# Create the PR body template
PR_BODY=$(gh pr view 18715 --json body --template 'Backport f39fc1e6e623bc88bf4d5d8e2e0c2ca039f5967f from #18715{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'fix: Update dskit to fix linux/arm build (backport k266)' --body-file - --label 'size/XS' --label 'type/bug' --label 'backport' --base k266 --milestone k266 --webOr, 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-18715-to-k266
# Create a pull request where the `base` branch is `k266` and the `compare`/`head` branch is `backport-18715-to-k266`.
# Remove the local backport branch
git switch main
git branch -D backport-18715-to-k266 |
salvacorts
added a commit
that referenced
this pull request
Aug 5, 2025
(cherry picked from commit f39fc1e)
salvacorts
added a commit
that referenced
this pull request
Aug 5, 2025
This was referenced Nov 3, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Incorporating this fix grafana/dskit#730
Checklist
CONTRIBUTING.mdguide (required)featPRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.docs/sources/setup/upgrade/_index.mddeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR