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

bump(deps): bump ngx_brotli version to master branch #12396

Merged
merged 2 commits into from
Jan 29, 2024

Conversation

oowl
Copy link
Member

@oowl oowl commented Jan 23, 2024

Summary

  1. bump ngx_brotli version to master branch https://github.com/google/ngx_brotli
  2. disable ngx_brotli feature in rhel7 rhel9-arm64 and amazonlinux-2023-arm64 regarding to toolchain error.

Checklist

  • The Pull Request has tests
  • A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

FTI-5706

@chronolaw
Copy link
Contributor

I saw that the 1.0.0rc is too old (2020.04.23), but the master commit is also unstable, do we have other choice?

@AndyZhang0707 AndyZhang0707 added this to the 3.6.0 milestone Jan 24, 2024
@pull-request-size pull-request-size bot added size/L and removed size/S labels Jan 24, 2024
@github-actions github-actions bot added the chore Not part of the core functionality of kong, but still needed label Jan 24, 2024
@oowl oowl force-pushed the bump/brotli-master branch 2 times, most recently from 2841bda to 7652402 Compare January 24, 2024 15:21
@oowl
Copy link
Member Author

oowl commented Jan 25, 2024

After getting approve, I will squash this PR to two commits (one for bump, another one for disabling feature in some package).

@oowl
Copy link
Member Author

oowl commented Jan 25, 2024

I saw that the 1.0.0rc is too old (2020.04.23), but the master commit is also unstable, do we have other choice?

Context: #12367 (comment)

@oowl oowl force-pushed the bump/brotli-master branch 2 times, most recently from 848018f to 359c565 Compare January 29, 2024 08:01
@oowl oowl force-pushed the bump/brotli-master branch from 359c565 to d9de18e Compare January 29, 2024 08:04
@fffonion fffonion merged commit 15aa0e4 into master Jan 29, 2024
24 checks passed
@fffonion fffonion deleted the bump/brotli-master branch January 29, 2024 08:38
@team-gateway-bot
Copy link
Collaborator

Successfully created backport PR for release/3.6.x:

@oowl oowl added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Jan 29, 2024
@team-gateway-bot
Copy link
Collaborator

Git push to origin failed for release/3.6.x with exitcode 1

@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-12396-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-12396-to-master-to-upstream
git checkout -b cherry-pick-12396-to-master-to-upstream
ancref=$(git merge-base b52d764d9b9bba0819128053940294175e2aaa24 d9de18e4c6ed6a51bb6eb1b831c825642220a749)
git cherry-pick -x $ancref..d9de18e4c6ed6a51bb6eb1b831c825642220a749

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee chore Not part of the core functionality of kong, but still needed size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants