Skip to content

Conversation

@salvacorts
Copy link
Contributor

What this PR does / why we need it:

Incorporating this fix grafana/dskit#730

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

@salvacorts salvacorts requested a review from a team as a code owner August 4, 2025 15:02
@salvacorts salvacorts enabled auto-merge (squash) August 4, 2025 15:03
@salvacorts salvacorts added the type/bug Somehing is not working as expected label Aug 4, 2025
@salvacorts salvacorts force-pushed the salvacorts/fix-32bits-build-dskit branch from 93ca517 to 3da8901 Compare August 4, 2025 15:08
@salvacorts salvacorts merged commit f39fc1e into main Aug 4, 2025
67 checks passed
@salvacorts salvacorts deleted the salvacorts/fix-32bits-build-dskit branch August 4, 2025 15:16
@loki-gh-app
Copy link
Contributor

loki-gh-app bot commented Aug 4, 2025

The backport to k266 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-18715-to-k266 origin/k266
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x f39fc1e6e623bc88bf4d5d8e2e0c2ca039f5967f

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-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 --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-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 4, 2025
salvacorts added a commit that referenced this pull request Aug 4, 2025
salvacorts added a commit that referenced this pull request Aug 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants