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

chore(deps): Downgrade fake-gcs-server #14078

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Conversation

paul1r
Copy link
Collaborator

@paul1r paul1r commented Sep 7, 2024

What this PR does / why we need it:
A previous upgrade of fake-gcs-server has resulting in failures during the dist steps of our releases.

This PR reverts the upgrade of the fake-gcs-server from the original PR, but keeps the upgraded libraries.

Which issue(s) this PR fixes:

Special notes for your reviewer:

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
  • 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
  • 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

@paul1r paul1r requested a review from a team as a code owner September 7, 2024 16:31
pkg/storage/chunk/client/gcp/fixtures.go Outdated Show resolved Hide resolved
@paul1r paul1r merged commit 20ac1ba into main Sep 9, 2024
60 checks passed
@paul1r paul1r deleted the paul1r/downgrade_fake_gcs_server branch September 9, 2024 18:13
@trevorwhitney trevorwhitney added type/bug Somehing is not working as expected product-approved backport k218 labels Sep 9, 2024
@grafanabot
Copy link
Collaborator

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

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-14078-to-k218
# Create the PR body template
PR_BODY=$(gh pr view 14078 --json body --template 'Backport 20ac1bacd89228fb863a6b0a3e574e27368cf9b0 from #14078{{ "\n\n---\n\n" }}{{ index . "body" }}')
# Create the PR on GitHub
echo "${PR_BODY}" | gh pr create --title 'chore: [k218] chore(deps): Downgrade fake-gcs-server' --body-file - --label 'size/M' --label 'type/bug' --label 'product-approved' --label 'backport' --base k218 --milestone k218 --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-14078-to-k218

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

# Remove the local backport branch
git switch main
git branch -D backport-14078-to-k218

trevorwhitney pushed a commit that referenced this pull request Sep 9, 2024
Co-authored-by: Trevor Whitney <trevorjwhitney@gmail.com>
(cherry picked from commit 20ac1ba)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants