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 parquet-go to fix trace by id regression #4730

Merged
merged 1 commit into from
Feb 21, 2025

Conversation

joe-elliott
Copy link
Member

Upgrades parquet-go to catch parquet-go/parquet-go#246 (review)

Signed-off-by: Joe Elliott <[email protected]>
@joe-elliott joe-elliott added type/bug Something isn't working backport r188 labels Feb 21, 2025
Copy link
Contributor

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

1 similar comment
Copy link
Contributor

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

@joe-elliott joe-elliott merged commit 1b63c9f into grafana:main Feb 21, 2025
16 checks passed
Copy link
Contributor

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

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-4730-to-r188
# Create the PR body template
PR_BODY=$(gh pr view 4730 --json body --template 'Backport 1b63c9fffc78af00a341e659f5d4d18d9990b466 from #4730{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title '[r188] Upgrade parquet-go to fix trace by id regression' --body-file - --label 'type/bug' --label 'backport' --base r188 --milestone r188 --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-4730-to-r188

# Create a pull request where the `base` branch is `r188` and the `compare`/`head` branch is `backport-4730-to-r188`.

# Remove the local backport branch
git switch main
git branch -D backport-4730-to-r188

joe-elliott added a commit that referenced this pull request Feb 21, 2025
Signed-off-by: Joe Elliott <[email protected]>
(cherry picked from commit 1b63c9f)
joe-elliott added a commit that referenced this pull request Feb 21, 2025
Signed-off-by: Joe Elliott <[email protected]>
(cherry picked from commit 1b63c9f)
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