-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
fix(build): use NGX_WASM_MODULE_BRANCH environment variable #12241
Conversation
a6d812e
to
b1b7021
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me as long as it's working!
Are there any caveats to this with regards to bazel's caching that should be documented? i.e. Do I need to manually purge the cache when changing NGX_WASM_MODULE_BRANCH
?
e866264
to
0ccf54c
Compare
Yes, after the first build |
0ccf54c
to
94a054e
Compare
If I keep those variables unchanged but change the actual code in the branch between runs, does it require a purge as well? |
the environ variable should be added to https://github.com/Kong/kong/pull/12241/files#diff-2cc0f6ace9a475cc6da6de926e8eabbe69e8b7e6e5c4fb721ec83d59f3f04725R113 here to evict cache (of the kong_bindings.bzl file/repository only) |
9017aa0
to
327529d
Compare
@fffonion - can you re-review this now? |
327529d
to
e4465e9
Compare
@@ -0,0 +1,3 @@ | |||
message: use NGX_WASM_MODULE_BRANCH environment variable to set ngx_wasm_module repository branch when building Kong. | |||
type: bugfix | |||
scope: Core |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"chore"?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree it would be a better option, but it is not one of the types available in the new changelog format.
4678671
to
dcb0478
Compare
dcb0478
to
23e6aa0
Compare
Cherry-pick failed for 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-12241-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-12241-to-master-to-upstream
git checkout -b cherry-pick-12241-to-master-to-upstream
ancref=$(git merge-base 36c3836326d29444b400d45d7e6cdcba67f065a6 23e6aa078b29ddb325d57d7905f1a68c47fa489f)
git cherry-pick -x $ancref..23e6aa078b29ddb325d57d7905f1a68c47fa489f |
Summary
To improve the development and testing experience of the integration between Kong and Wasmx, the
NGX_WASM_MODULE_BRANCH
environment variable should be used to overwrite thengx_wasm_module
branch/commit in the.requirements
file, as it is documented inbuild/README.md
. But this variable was being ignored by the build system.Checklist
changelog/unreleased/kong
orskip-changelog
label added on PR if changelog is unnecessary. README.mdIssue reference
KAG-3396