fix(build): fix the building failure when applying patches (#11696)

When openresty patch applying order matters, some patch applying fails. Fix it by sorting.
Kong · Oct 5, 2023 · e373295 · e373295 · khcp-gha-bot · Oct 5, 2023
1 parent 32872bf
commit e373295
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/build/kong_bindings.bzl b/build/kong_bindings.bzl
@@ -54,10 +54,10 @@ def _load_vars(ctx):
 
     # convert them into a list of labels relative to the workspace root
     # TODO: this may not change after a bazel clean if cache exists
-    patches = [
+    patches = sorted([
         '"@kong//:%s"' % str(p).replace(workspace_path, "").lstrip("/")
         for p in ctx.path(workspace_path + "/build/openresty/patches").readdir()
-    ]
+    ])
 
     content += '"OPENRESTY_PATCHES": [%s],' % (", ".join(patches))
 

diff --git a/changelog/unreleased/kong/fix_patch_order.yml b/changelog/unreleased/kong/fix_patch_order.yml
@@ -0,0 +1,7 @@
+message: fix the building failure when applying patches
+type: bugfix
+scope: Core
+prs:
+  - 11696
+jiras:
+  - KAG-2712