fix(build): use a more reliable way to replace websocket library

Kong · Sep 29, 2024 · 1a5bbfa · 1a5bbfa · github-actions · Sep 29, 2024
1 parent 8210e88
commit 1a5bbfa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/build/BUILD.bazel b/build/BUILD.bazel
@@ -249,9 +249,6 @@ kong_genrule(
         mkdir -p ${BUILD_DESTDIR}/etc/kong/
         cp ${WORKSPACE_PATH}/kong.conf.default ${BUILD_DESTDIR}/etc/kong/kong.conf.default
 
-        # TODO: remove this after lua-resty-websocket becomes a patch or merged to upstream
-        rm -rf ${BUILD_DESTDIR}/openresty/lualib/resty/websocket
-
         # housecleaning
         if [[ -d ${BUILD_DESTDIR}/kong/lib64 ]]; then
             cp -r ${BUILD_DESTDIR}/kong/lib64/* ${BUILD_DESTDIR}/kong/lib/.

diff --git a/build/openresty/BUILD.openresty.bazel b/build/openresty/BUILD.openresty.bazel
@@ -314,10 +314,11 @@ configure_make(
         "//conditions:default": [],
     }),
     postfix_script = select({
-        # macOS ln doesn't support -r/relative path
-        "@platforms//os:macos": "ln -sf openresty/nginx/sbin/nginx openresty/bin/openresty",
-        "//conditions:default": "ln -srf openresty/nginx/sbin/nginx openresty/bin/openresty",
-    }),
+                         # macOS ln doesn't support -r/relative path
+                         "@platforms//os:macos": "ln -sf openresty/nginx/sbin/nginx openresty/bin/openresty",
+                         "//conditions:default": "ln -srf openresty/nginx/sbin/nginx openresty/bin/openresty",
+                     }) +  # TODO: remove this after lua-resty-websocket becomes a patch or merged to upstream
+                     " && rm -rf $INSTALLDIR/lualib/resty/websocket",
     targets = [
         "-j " + KONG_VAR["NPROC"],
         "install -j" + KONG_VAR["NPROC"],