chore(ci) bump and sync CC version among Dockerfiles and CI workflows

Dockerfiles and CI workflow use the latest version available in the runner OS. Older versions of gcc and clang are tested in CI Large.
Kong · Sep 7, 2023 · c45aef5 · c45aef5
1 parent a999747
commit c45aef5
Show file tree

Hide file tree

Showing 5 changed files with 143 additions and 52 deletions.
diff --git a/.github/workflows/ci-large.yml b/.github/workflows/ci-large.yml
@@ -22,7 +22,7 @@ jobs:
         label: [""]
         os: [ubuntu-latest]
         #os: [ubuntu-latest, macos-latest]
-        cc: [gcc-9]
+        cc: [gcc-12]
         ngx: [1.25.2]
         runtime: [wasmtime, wasmer, v8]
         wasmtime: [12.0.1]
@@ -35,7 +35,7 @@ jobs:
           # OpenResty + static ngx_wasm_module
           - label: dynamic_module
             os: ubuntu-latest
-            cc: gcc-9
+            cc: gcc-12
             openresty: 1.21.4.1
             runtime: wasmtime
             wasmtime: 12.0.1
@@ -65,7 +65,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-22.04]
-        cc: [gcc-10]
+        cc: [gcc-12]
         ngx: [1.25.2]
         runtime: [wasmer, wasmtime, v8]
         wasmtime: [12.0.1]
@@ -77,7 +77,7 @@ jobs:
           # OpenResty
           - label: openresty
             os: ubuntu-22.04
-            cc: gcc-10
+            cc: gcc-12
             openresty: 1.21.4.1
             runtime: wasmer
             wasmer: 3.1.1
@@ -103,7 +103,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        cc: [clang-11]
+        cc: [clang-15]
         openresty: [1.21.4.1]
         runtime: [wasmtime, wasmer, v8]
         wasmtime: [12.0.1]
@@ -122,3 +122,39 @@ jobs:
       v8: ${{ matrix.v8 }}
       ssl: ${{ matrix.ssl }}
       debug: ${{ matrix.debug }}
+
+  build-large:
+    name: 'Build'
+    #if: ${{ false }}
+    strategy:
+      fail-fast: false
+      matrix:
+        label: [""]
+        os: [ubuntu-latest]
+        cc: [clang-14, clang-15, gcc-11, gcc-12]
+        ngx: [1.25.2]
+        runtime: [wasmtime, wasmer, v8]
+        wasmtime: [12.0.1]
+        wasmer: [3.1.1]
+        v8: [11.4.183.23]
+        ssl: [ssl]
+        debug: [debug]
+        include:
+          - label: old_nginx
+            os: [ubuntu-latest]
+            cc: clang-15
+            ngx: 1.21.6
+            runtime: wasmtime
+            wasmtime: 12.0.1
+    uses: ./.github/workflows/job-build-tests.yml
+    with:
+      os: ${{ matrix.os }}
+      cc: ${{ matrix.cc }}
+      ngx: ${{ matrix.ngx }}
+      openresty: ${{ matrix.openresty }}
+      runtime: ${{ matrix.runtime }}
+      wasmtime: ${{ matrix.wasmtime }}
+      wasmer: ${{ matrix.wasmer }}
+      v8: ${{ matrix.v8 }}
+      ssl: ${{ matrix.ssl }}
+      debug: ${{ matrix.debug }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
       matrix:
         label: [""]
         os: [ubuntu-latest]
-        cc: [gcc-9]
+        cc: [gcc-12]
         ngx: [1.25.2]
         openresty: [""]
         runtime: [wasmer]
@@ -44,7 +44,7 @@ jobs:
           - runtime: wasmtime
             wasmtime: 12.0.1
             os: ubuntu-latest
-            cc: gcc-9
+            cc: gcc-12
             ngx: 1.25.2
             ssl: ssl
             debug: debug
@@ -53,15 +53,15 @@ jobs:
           - runtime: v8
             v8: 11.4.183.23
             os: ubuntu-latest
-            cc: gcc-9
+            cc: gcc-12
             ngx: 1.25.2
             ssl: ssl
             debug: debug
             hup: no_hup
           # Old Nginx
           - label: old_nginx
             os: ubuntu-latest
-            cc: gcc-9
+            cc: gcc-12
             ngx: 1.21.6
             runtime: wasmer
             wasmer: 3.1.1
@@ -71,7 +71,7 @@ jobs:
           # Nginx + dynamic ngx_wasm_module + HUP
           - label: dynamic_nginx
             os: ubuntu-latest
-            cc: gcc-9
+            cc: gcc-12
             ngx: 1.25.2
             runtime: wasmtime
             wasmtime: 12.0.1
@@ -81,7 +81,7 @@ jobs:
             module_type: dynamic
           # No SSL
           - os: ubuntu-latest
-            cc: gcc-9
+            cc: gcc-12
             ngx: 1.25.2
             runtime: wasmer
             wasmer: 3.1.1
@@ -91,7 +91,7 @@ jobs:
           # OpenResty
           - label: openresty
             os: ubuntu-latest
-            cc: gcc-9
+            cc: gcc-12
             openresty: 1.21.4.1
             runtime: wasmtime
             wasmtime: 12.0.1
@@ -101,7 +101,7 @@ jobs:
           # OpenResty + dynamic ngx_wasm_module
           - label: dynamic_openresty
             os: ubuntu-latest
-            cc: gcc-9
+            cc: gcc-12
             openresty: 1.21.4.1
             runtime: wasmtime
             wasmtime: 12.0.1
@@ -147,7 +147,7 @@ jobs:
       matrix:
         label: [""]
         os: [ubuntu-22.04]
-        cc: [gcc-10]
+        cc: [gcc-12]
         ngx: [1.25.2]
         openresty: [""]
         runtime: [wasmer]
@@ -161,22 +161,22 @@ jobs:
           - runtime: wasmtime
             wasmtime: 12.0.1
             os: ubuntu-22.04
-            cc: gcc-10
+            cc: gcc-12
             ngx: 1.25.2
             hup: no_hup
             debug: debug
           # V8
           - runtime: v8
             v8: 11.4.183.23
             os: ubuntu-22.04
-            cc: gcc-10
+            cc: gcc-12
             ngx: 1.25.2
             debug: debug
             hup: no_hup
           # OpenResty
           - label: openresty
             os: ubuntu-22.04
-            cc: gcc-10
+            cc: gcc-12
             openresty: 1.21.4.1
             ngx:
             runtime: wasmer
@@ -240,7 +240,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cc: [clang-11]
+        cc: [clang-15]
         openresty: [1.21.4.1]
         runtime: [wasmtime, wasmer, v8]
         wasmtime: [12.0.1]
@@ -251,7 +251,7 @@ jobs:
         include:
           # No SSL
           - os: ubuntu-latest
-            cc: clang-11
+            cc: clang-15
             ngx: 1.25.2
             runtime: wasmer
             wasmer: 3.1.1
@@ -272,39 +272,27 @@ jobs:
   build:
     name: 'Build'
     #if: ${{ false }}
-    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        label: [""]
         os: [ubuntu-latest]
-        cc: [clang-14, gcc-10]
+        cc: [clang-15, gcc-12]
         ngx: [1.25.2]
         runtime: [wasmtime, wasmer, v8]
         wasmtime: [12.0.1]
         wasmer: [3.1.1]
         v8: [11.4.183.23]
-        include:
-          - label: old_nginx
-            os: ubuntu-latest
-            cc: clang-14
-            ngx: 1.21.6
-            runtime: wasmtime
-            wasmtime: 12.0.1
-    steps:
-      - uses: actions/checkout@v3
-      - name: 'Setup cache - work/ dir'
-        uses: actions/cache@v3
-        if: ${{ !env.ACT }}
-        with:
-          path: |
-            work/downloads
-            work/runtimes
-            work/openssl
-          key: work-${{ runner.os }}-${{ matrix.cc }}-${{ matrix.ngx }}-${{ matrix.openresty }}-${{ matrix.runtime }}-${{ hashFiles('util/**/*.sh', 'util/**/*.pl', 'util/**/*.awk', '.github/**/*.yml', '.github/**/*.sh', '.github/**/*.js', 'rust-toolchain', 'Makefile') }}
-      - name: Setup Wasm runtime
-        run: ./util/runtime.sh -R ${{ matrix.runtime }} -V ${{ matrix[matrix.runtime] }}
-      - run: make setup
-      - run: make test-build
-        env:
-          NGX_WASM_RUNTIME: ${{ matrix.runtime }}
+        ssl: [ssl]
+        debug: [debug]
+    uses: ./.github/workflows/job-build-tests.yml
+    with:
+      os: ${{ matrix.os }}
+      cc: ${{ matrix.cc }}
+      ngx: ${{ matrix.ngx }}
+      openresty: ${{ matrix.openresty }}
+      runtime: ${{ matrix.runtime }}
+      wasmtime: ${{ matrix.wasmtime }}
+      wasmer: ${{ matrix.wasmer }}
+      v8: ${{ matrix.v8 }}
+      ssl: ${{ matrix.ssl }}
+      debug: ${{ matrix.debug }}
diff --git a/.github/workflows/job-build-tests.yml b/.github/workflows/job-build-tests.yml
@@ -0,0 +1,67 @@
+name: Build tests
+
+on:
+  workflow_call:
+    inputs:
+      os:
+        required: true
+        type: string
+      cc:
+        required: true
+        type: string
+      ngx:
+        required: true
+        type: string
+      openresty:
+        required: true
+        type: string
+      runtime:
+        required: true
+        type: string
+      wasmtime:
+        required: true
+        type: string
+      wasmer:
+        required: true
+        type: string
+      v8:
+        required: true
+        type: string
+      debug:
+        required: true
+        type: string
+      ssl:
+        required: true
+        type: string
+
+defaults:
+  run:
+    shell: bash
+
+env:
+  CC: ${{ inputs.cc }}
+  NGX_BUILD_OPENRESTY: ${{ inputs.openresty }}
+  NGX_WASM_RUNTIME: ${{ inputs.runtime }}
+  NGX_BUILD_DEBUG: ${{ inputs.debug == 'debug' && 1 || 0 }}
+  NGX_BUILD_SSL: ${{ inputs.ssl == 'ssl' && 1 || 0 }}
+
+jobs:
+  build:
+    name: 'Build'
+    #if: ${{ false }}
+    runs-on: ${{ inputs.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: 'Setup cache - work/ dir'
+        uses: actions/cache@v3
+        if: ${{ !env.ACT }}
+        with:
+          path: |
+            work/downloads
+            work/runtimes
+            work/openssl
+          key: work-${{ runner.os }}-${{ inputs.cc }}-${{ inputs.ngx }}-${{ inputs.openresty }}-${{ inputs.runtime }}-${{ hashFiles('util/**/*.sh', 'util/**/*.pl', 'util/**/*.awk', '.github/**/*.yml', '.github/**/*.sh', '.github/**/*.js', 'rust-toolchain', 'Makefile') }}
+      - name: Setup Wasm runtime
+        run: ./util/runtime.sh -R ${{ inputs.runtime }} -V ${{ inputs[inputs.runtime] }}
+      - run: make setup
+      - run: make test-build
diff --git a/.github/workflows/job-unit-tests.yml b/.github/workflows/job-unit-tests.yml
@@ -70,8 +70,8 @@ jobs:
       coveralls_name: ${{ steps.lcov.outputs.name }}
     steps:
       - name: 'Setup deps - apt-get'
-        if: ${{ inputs.cc == 'gcc-9' }}
-        run: sudo apt-get update && sudo apt-get install -y gcc-9 libstdc++-9-dev lcov
+        if: ${{ !env.ACT }}
+        run: sudo apt-get update && sudo apt-get install -y ${CC} libstdc++-${CC#*-}-dev lcov
       - uses: actions/checkout@v3
       - name: 'Setup cache - rustup toolchain'
         if: ${{ !env.ACT }}
@@ -116,7 +116,7 @@ jobs:
       - run: make test
       - name: Run lcov
         id: lcov
-        if: ${{ !env.ACT && inputs.cc == 'gcc-9' && inputs.coverage }}
+        if: ${{ !env.ACT && inputs.coverage }}
         run: |
           lcov --capture --directory work/buildroot --output-file lcov.info
           lcov --remove lcov.info "*/ngx_wasm_module/src/common/debug/*" --output-file lcov.info
@@ -139,7 +139,7 @@ jobs:
           fi
           echo "name=$name" >> $GITHUB_OUTPUT
       - name: Coveralls Upload
-        if: ${{ !env.ACT && inputs.cc == 'gcc-9' && inputs.coverage }}
+        if: ${{ !env.ACT && inputs.coverage }}
         uses: coverallsapp/github-action@v2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04 b/assets/release/Dockerfiles/Dockerfile.ubuntu-22.04
@@ -11,8 +11,8 @@ RUN apt-get update && \
         ninja-build \
         python3 \
         cmake \
-        gcc-11 \
-        libstdc++-11-dev \
+        gcc-12 \
+        libstdc++-12-dev \
         git \
         pkg-config \
         libglib2.0-dev \