diff --git a/.github/matrix-full.yml b/.github/matrix-full.yml index 70b4787491ec..b011607f4c89 100644 --- a/.github/matrix-full.yml +++ b/.github/matrix-full.yml @@ -38,7 +38,7 @@ build-packages: image: centos:7 package: rpm package-type: el7 - bazel-args: --//:wasmx_el7_workaround=true + bazel-args: --//:wasmx_el7_workaround=true --//:brotli=False check-manifest-suite: el7-amd64 - label: rhel-8 image: rockylinux:8 @@ -53,7 +53,7 @@ build-packages: - label: rhel-9-arm64 package: rpm package-type: el9 - bazel-args: --platforms=//:rhel9-crossbuild-aarch64 + bazel-args: --platforms=//:rhel9-crossbuild-aarch64 --//:brotli=False check-manifest-suite: el9-arm64 # Amazon Linux @@ -70,7 +70,7 @@ build-packages: - label: amazonlinux-2023-arm64 package: rpm package-type: aws2023 - bazel-args: --platforms=//:aws2023-crossbuild-aarch64 + bazel-args: --platforms=//:aws2023-crossbuild-aarch64 --//:brotli=False check-manifest-suite: amazonlinux-2023-arm64 build-images: diff --git a/changelog/unreleased/kong/bump_ngx_brotli.yml b/changelog/unreleased/kong/bump_ngx_brotli.yml new file mode 100644 index 000000000000..7c05da00c794 --- /dev/null +++ b/changelog/unreleased/kong/bump_ngx_brotli.yml @@ -0,0 +1,3 @@ +message: Bumped ngx_brotli to master branch, and disabled it on rhel7 rhel9-arm64 and amazonlinux-2023-arm64 due to toolchain issues +type: dependency +scope: Core diff --git a/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt b/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt index a9f1b4faf91e..48576d505f1f 100644 --- a/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt +++ b/scripts/explain_manifest/fixtures/amazonlinux-2023-arm64.txt @@ -169,7 +169,6 @@ - lua-kong-nginx-module/stream - lua-resty-events - lua-resty-lmdb - - ngx_brotli - ngx_wasm_module OpenSSL : OpenSSL 3.2.0 23 Nov 2023 DWARF : True diff --git a/scripts/explain_manifest/fixtures/el7-amd64.txt b/scripts/explain_manifest/fixtures/el7-amd64.txt index 34190b2b9247..b0d0b772ff03 100644 --- a/scripts/explain_manifest/fixtures/el7-amd64.txt +++ b/scripts/explain_manifest/fixtures/el7-amd64.txt @@ -201,7 +201,6 @@ - lua-kong-nginx-module/stream - lua-resty-events - lua-resty-lmdb - - ngx_brotli - ngx_wasm_module OpenSSL : OpenSSL 3.2.0 23 Nov 2023 DWARF : True diff --git a/scripts/explain_manifest/fixtures/el9-arm64.txt b/scripts/explain_manifest/fixtures/el9-arm64.txt index a9f1b4faf91e..48576d505f1f 100644 --- a/scripts/explain_manifest/fixtures/el9-arm64.txt +++ b/scripts/explain_manifest/fixtures/el9-arm64.txt @@ -169,7 +169,6 @@ - lua-kong-nginx-module/stream - lua-resty-events - lua-resty-lmdb - - ngx_brotli - ngx_wasm_module OpenSSL : OpenSSL 3.2.0 23 Nov 2023 DWARF : True