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

[Backport release/3.2.x] chore(patches): fix ldoc intermittent fail caused by LuaJIT #12143

Merged
merged 1 commit into from
Dec 14, 2023

Conversation

team-gateway-bot
Copy link
Collaborator

@team-gateway-bot team-gateway-bot commented Dec 4, 2023

Backport c7c44a2 from #11983.

Fix #KAG-1761

@zhongweiy
Copy link
Contributor

@bungle The CI's build cache is hit and there is no build log to check in CI build log. But I verified it locally and hope I have not missed something.

@flrgh do you know whether the build cache hit in this case is expected? I changed the patch format in the latest commit (9f14932) and expect the build will run from scratch.

CI build log:
https://github.com/Kong/kong/actions/runs/7205876448/job/19629622712?pr=12143

@zhongweiy zhongweiy requested review from bungle and locao December 14, 2023 08:03
@bungle
Copy link
Member

bungle commented Dec 14, 2023

@zhongweiy you have missed something:

patching file bundle/LuaJIT-2.1-20220411/src/lj_record.c
Hunk #1 succeeded at 970 (offset -5 lines).

This is how I test these:

#!/bin/zsh
rm -Rf openresty-1.21.4.1
tar zxvf openresty-1.21.4.1.tar.gz
cd openresty-1.21.4.1/
for i in ~/Sources/kong/build/openresty/patches/*.patch; do patch -p1 < $i; done
cd ../..

Please use gnu patch.

Copy link
Member

@bungle bungle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see comment above.

@zhongweiy zhongweiy force-pushed the backport-11983-to-release/3.2.x branch from 9f14932 to dcc2ab2 Compare December 14, 2023 09:30
@zhongweiy zhongweiy requested a review from bungle December 14, 2023 09:32
@zhongweiy
Copy link
Contributor

updated. I should come up some patch to make this process easier.

@bungle
Copy link
Member

bungle commented Dec 14, 2023

updated. I should come up some patch to make this process easier.

@zhongweiy and also a test that does not allow non-cleanly applying patches, or upgrading openresty and then make patches not apply correctly, should also be blocked.

@bungle bungle added the pr/ready This PR is considered ready and can be merged at anytime (given it received no subsequent changes) label Dec 14, 2023
@bungle bungle merged commit 214059c into release/3.2.x Dec 14, 2023
23 checks passed
@bungle bungle deleted the backport-11983-to-release/3.2.x branch December 14, 2023 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build/bazel pr/ready This PR is considered ready and can be merged at anytime (given it received no subsequent changes) size/S
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants