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.

Sign up for GitHub

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

Jump to bottom

chore(deps): bump openresty to 1.27.1.1 #14163

Merged
merged 1 commit into from
Jan 27, 2025
Merged

chore(deps): bump openresty to 1.27.1.1 #14163

merged 1 commit into from
Jan 27, 2025

Conversation

bungle
Copy link
Member

@bungle bungle commented Jan 14, 2025 •
edited
Loading

Summary

Bumps OpenResty to 1.27.1.1.

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

KAG-6202

The EE PR is here: https://github.com/Kong/kong-ee/pull/11243

@github-actions github-actions bot added core/templates build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Jan 14, 2025
@bungle bungle marked this pull request as draft January 14, 2025 20:07
@bungle bungle force-pushed the chore/openresty-1.27.1.1 branch 4 times, most recently from 069b2cf to cc4f2b7 Compare January 16, 2025 08:55
@oowl
Copy link
Member

oowl commented Jan 20, 2025

We backported the upstream updates of openresty in this change 398172d, but it seems that the openresty bumped in this PR already includes them, so we need to do special handling in this PR

@bungle bungle force-pushed the chore/openresty-1.27.1.1 branch 4 times, most recently from 4cda7cb to cf914af Compare January 20, 2025 12:53
@bungle
Copy link
Member Author

bungle commented Jan 20, 2025

We backported the upstream updates of openresty in this change 398172d, but it seems that the openresty bumped in this PR already includes them, so we need to do special handling in this PR

Ok, I understand now. This PR started breaking after rebasing. And it was because patches merged to master that does not have "THIS PR IN", a new patch was added and this patch was copied here on rebase. Now those patches are deleted as they are included in upstream already.

@bungle bungle force-pushed the chore/openresty-1.27.1.1 branch 2 times, most recently from 5d539e4 to baca269 Compare January 20, 2025 16:28
@bungle bungle marked this pull request as ready for review January 20, 2025 16:30
@oowl
Copy link
Member

oowl commented Jan 20, 2025

build/openresty/patches/nginx-1.27.1_12-fix-preread-bug.patch has been submitted to upstream nginx/nginx#461

@bungle bungle force-pushed the chore/openresty-1.27.1.1 branch 3 times, most recently from 114b0c7 to fa23bda Compare January 21, 2025 16:07
@bungle bungle merged commit 8e441df into master Jan 27, 2025
29 checks passed
@bungle bungle deleted the chore/openresty-1.27.1.1 branch January 27, 2025 09:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oowl oowl oowl approved these changes

@fffonion fffonion fffonion approved these changes

Assignees

@bungle bungle

Labels
build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee core/router core/templates size/XXL
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bungle @oowl @fffonion