Mjz 28x

.ci/setup_env_github.sh

@@ -10,6 +10,7 @@ LUAROCKS=$(dep_version RESTY_LUAROCKS_VERSION)
 OPENSSL=$(dep_version RESTY_OPENSSL_VERSION)
 GO_PLUGINSERVER=$(dep_version KONG_GO_PLUGINSERVER_VERSION)
 PCRE=$(dep_version RESTY_PCRE_VERSION)
+KONG_NGINX_MODULE_BRANCH=$(dep_version KONG_NGINX_MODULE_BRANCH)
 
 
 #---------
@@ -20,8 +21,6 @@ DOWNLOAD_ROOT=${DOWNLOAD_ROOT:=/download-root}
 BUILD_TOOLS_DOWNLOAD=$GITHUB_WORKSPACE/kong-build-tools
 GO_PLUGINSERVER_DOWNLOAD=$GITHUB_WORKSPACE/go-pluginserver
 
-KONG_NGINX_MODULE_BRANCH=${KONG_NGINX_MODULE_BRANCH:=master}
-
 #--------
 # Install
 #--------

.github/workflows/auto-assignee.yml

@@ -0,0 +1,12 @@
+name: Add assignee to PRs
+on:
+  pull_request:
+    types: [ opened, reopened ]
+permissions:
+  pull-requests: write
+jobs:
+  assign-author:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: toshimaru/auto-author-assign@2daaeb2988aef24bf37e636fe733f365c046aba0
+

.github/workflows/build_and_test.yml

@@ -155,11 +155,6 @@ jobs:
           - 6379:6379
         options: --entrypoint redis-server
 
-      squid:
-        image: datadog/squid
-        ports:
-          - 3128:3128
-
       zipkin:
         image: openzipkin/zipkin:2.19
         ports:
@@ -283,11 +278,6 @@ jobs:
           - 6379:6379
         options: --entrypoint redis-server
 
-      squid:
-        image: datadog/squid
-        ports:
-          - 3128:3128
-
       zipkin:
         image: openzipkin/zipkin:2.19
         ports:

.github/workflows/package.yml

@@ -0,0 +1,128 @@
+name: Package & Smoke Test
+
+on:  # yamllint disable-line rule:truthy
+  pull_request:
+  push:
+    branches:
+    - master
+    - next/*
+    - release/*
+
+env:
+  DOCKER_REPOSITORY: kong/kong-build-tools
+
+jobs:
+  package-and-test:
+    if: github.event_name == 'pull_request'
+    name: Build & Smoke Test Packages
+    runs-on: ubuntu-22.04
+
+    steps:
+    - name: Swap git with https
+      run: git config --global url."https://github".insteadOf git://github
+
+    - name: Setup some environment variables
+      run: |
+        echo "KONG_SOURCE_LOCATION=$GITHUB_WORKSPACE/kong-src" >> $GITHUB_ENV
+        echo "KONG_BUILD_TOOLS_LOCATION=$GITHUB_WORKSPACE/kong-build-tools" >> $GITHUB_ENV
+
+    - name: Checkout Kong source code
+      uses: actions/checkout@v3
+      with:
+        path: ${{ env.KONG_SOURCE_LOCATION }}
+        submodules: recursive
+        token: ${{ secrets.GHA_KONG_BOT_READ_TOKEN }}
+
+    - name: Setup kong-build-tools
+      run: |
+        pushd ${{ env.KONG_SOURCE_LOCATION }}
+        make setup-kong-build-tools
+
+    - name: Setup package naming environment variables
+      run: |
+        grep -v '^#' ${{ env.KONG_SOURCE_LOCATION}}/.requirements >> $GITHUB_ENV
+
+    - name: Package & Test
+      env:
+        GITHUB_TOKEN: ${{ secrets.GHA_KONG_BOT_READ_TOKEN }}
+      run: |
+          pushd ${{ env.KONG_SOURCE_LOCATION }}
+          make package/test/deb
+
+  package-test-and-unofficial-release:
+    if: github.event_name == 'push'
+    name: Build & Smoke & Unofficial Release Packages
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        package_type: [deb, rpm, apk]
+
+    steps:
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.GHA_DOCKERHUB_PUSH_USER }}
+        password: ${{ secrets.GHA_KONG_ORG_DOCKERHUB_PUSH_TOKEN }}
+
+    - name: Swap git with https
+      run: git config --global url."https://github".insteadOf git://github
+
+    - name: Setup directory environment variables
+      run: |
+        echo "KONG_SOURCE_LOCATION=$GITHUB_WORKSPACE/kong-src" >> $GITHUB_ENV
+        echo "KONG_BUILD_TOOLS_LOCATION=$GITHUB_WORKSPACE/kong-build-tools" >> $GITHUB_ENV
+
+    - name: Checkout Kong source code
+      uses: actions/checkout@v3
+      with:
+        path: ${{ env.KONG_SOURCE_LOCATION }}
+        submodules: recursive
+        token: ${{ secrets.GHA_KONG_BOT_READ_TOKEN }}
+
+    - name: Setup kong-build-tools
+      run: |
+        pushd ${{ env.KONG_SOURCE_LOCATION }}
+        make setup-kong-build-tools
+
+    - name: Setup package naming environment variables
+      run: |
+        grep -v '^#' ${{ env.KONG_SOURCE_LOCATION}}/.requirements >> $GITHUB_ENV
+        echo "DOCKER_RELEASE_REPOSITORY=kong/kong" >> $GITHUB_ENV
+        echo "KONG_TEST_CONTAINER_TAG=${GITHUB_REF_NAME##*/}-${{ matrix.package_type }}" >> $GITHUB_ENV
+        if [[ ${{matrix.package_type }} == "apk" ]]; then
+          echo "ADDITIONAL_TAG_LIST=${GITHUB_REF_NAME##*/}-alpine" >> $GITHUB_ENV
+        fi
+        if [[ ${{matrix.package_type }} == "deb" ]]; then
+          echo "ADDITIONAL_TAG_LIST=${GITHUB_REF_NAME##*/}-debian ${GITHUB_REF_NAME##*/} $GITHUB_SHA" >> $GITHUB_ENV
+        fi
+
+    - name: Package & Test
+      env:
+        GITHUB_TOKEN: ${{ secrets.GHA_KONG_BOT_READ_TOKEN }}
+      run: |
+          pushd ${{ env.KONG_SOURCE_LOCATION }}
+          make package/test/${{ matrix.package_type }}
+
+    - name: Push Docker Image
+      continue-on-error: true
+      env:
+        SKIP_TESTS: true
+      run: |
+          pushd ${{ env.KONG_SOURCE_LOCATION }}
+          make release/docker/${{ matrix.package_type }}
+
+    - name: Store the package artifacts
+      continue-on-error: true
+      uses: actions/upload-artifact@v3
+      with:
+        name: ${{ matrix.package_type }}
+        path: ${{ env.KONG_BUILD_TOOLS_LOCATION }}/output/*
+
+    - name: Comment on commit
+      continue-on-error: true
+      uses: peter-evans/commit-comment@v2
+      with:
+        token: ${{ secrets.GHA_COMMENT_TOKEN }}
+        body: |
+          Docker image avaialble ${{ env.DOCKER_RELEASE_REPOSITORY }}:${{ env.KONG_TEST_CONTAINER_TAG }}
+          Artifacts availabe https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}

.requirements

@@ -4,9 +4,9 @@ KONG_LICENSE="ASL 2.0"
 
 RESTY_VERSION=1.19.9.1
 RESTY_LUAROCKS_VERSION=3.8.0
-RESTY_OPENSSL_VERSION=1.1.1m
+RESTY_OPENSSL_VERSION=1.1.1o
 RESTY_PCRE_VERSION=8.45
 LIBYAML_VERSION=0.2.5
 KONG_GO_PLUGINSERVER_VERSION=v0.6.1
-KONG_BUILD_TOOLS_VERSION=4.25.3
-KONG_NGINX_MODULE_BRANCH=0.2.0
+KONG_BUILD_TOOLS_VERSION=4.40.1
+KONG_NGINX_MODULE_BRANCH=0.2.1