Merge branch 'master' into changelog-3.6.0-master

.ci/test_suites.json

@@ -0,0 +1,41 @@
+[
+  {
+    "name": "unit",
+    "exclude_tags": "flaky,ipv6",
+    "venv_script": "kong-dev-venv.sh",
+    "specs": ["spec/01-unit/"]
+  },
+  {
+    "name": "integration",
+    "exclude_tags": "flaky,ipv6,off",
+    "environment": {
+      "KONG_TEST_DATABASE": "postgres"
+    },
+    "venv_script": "kong-dev-venv.sh",
+    "specs": ["spec/02-integration/"]
+  },
+  {
+    "name": "dbless",
+    "exclude_tags": "flaky,ipv6,postgres,db",
+    "environment": {
+      "KONG_TEST_DATABASE": "off"
+    },
+    "venv_script": "kong-dev-venv.sh",
+    "specs": [
+      "spec/02-integration/02-cmd/",
+      "spec/02-integration/05-proxy/",
+      "spec/02-integration/04-admin_api/02-kong_routes_spec.lua",
+      "spec/02-integration/04-admin_api/15-off_spec.lua",
+      "spec/02-integration/08-status_api/01-core_routes_spec.lua",
+      "spec/02-integration/08-status_api/03-readiness_endpoint_spec.lua",
+      "spec/02-integration/11-dbless/",
+      "spec/02-integration/20-wasm/"
+    ]
+  },
+  {
+    "name": "plugins",
+    "exclude_tags": "flaky,ipv6",
+    "venv_script": "kong-dev-venv.sh",
+    "specs": ["spec/03-plugins/"]
+  }
+]

.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:

.github/workflows/autodocs.yml

@@ -35,7 +35,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Lookup build cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-deps
         with:
           path: ${{ env.INSTALL_ROOT }}
@@ -94,7 +94,7 @@ jobs:
           ref: ${{ github.event.inputs.target_branch }}
 
       - name: Lookup build cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-deps
         with:
           path: ${{ env.INSTALL_ROOT }}

.github/workflows/backport.yml

@@ -15,6 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Create backport pull requests
         uses: korthout/backport-action@6e72f987c115430f6abc2fa92a74cdbf3e14b956 # v2.4.1
+        id: backport
         with:
           github_token: ${{ secrets.PAT }}
           pull_title: '[backport -> ${target_branch}] ${pull_title}'
@@ -34,3 +35,8 @@ jobs:
             {
               "detect_merge_method": true
             }
+      - name: add label
+        if: steps.backport.outputs.was_successful == 'false'
+        uses: actions-ecosystem/action-add-labels@18f1af5e3544586314bbe15c0273249c770b2daf # v1.1.0
+        with:
+          labels: incomplete-backport

.github/workflows/build.yml

@@ -37,7 +37,7 @@ jobs:
 
     - name: Lookup build cache
       id: cache-deps
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ${{ env.BUILD_ROOT }}
         key: ${{ steps.cache-key.outputs.cache-key }}