ci: use the same workflow logic for test and release

id · id · commit c92468fd24c3 · 2025-07-31T11:18:09.000+02:00
diff --git a/.ci/Dockerfile.amzn2 b/.ci/Dockerfile.amzn2
@@ -1,4 +1,4 @@
-ARG FROM=ghcr.io/emqx/emqx-builder/5.1-3:1.14.5-25.3.2-1-amzn2
+ARG FROM=ghcr.io/emqx/emqx-builder/5.5-5:1.18.3-27.3.4.2-1-amzn2
 FROM ${FROM}
 
 RUN alternatives --set python /usr/bin/python2 && \
diff --git a/.github/workflows/eunit.yaml b/.github/workflows/eunit.yaml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   mac:
+    name: macOS (${{ matrix.os }} ${{ matrix.otp }})
     strategy:
       fail-fast: false
       matrix:
@@ -32,17 +33,21 @@ jobs:
       - run: rebar3 eunit
 
   linux:
-    runs-on: ubuntu-latest
-
+    name: linux (${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.builder.otp }})
     strategy:
       fail-fast: false
       matrix:
-        builder:
-          - "5.5-5:1.18.3-27.3.4.2-1"
         os:
           - ubuntu24.04
+        arch:
+          - amd64
+          - arm64
+        builder:
+          - vsn: "5.5-5:1.18.3-27.3.4.2-1"
+            otp: "27.3.4.2-1"
 
-    container: ghcr.io/emqx/emqx-builder/${{ matrix.builder }}-${{ matrix.os }} 
+    runs-on: ubuntu-24.04${{ matrix.arch == 'arm64' && '-arm' || '' }}
+    container: ghcr.io/emqx/emqx-builder/${{ matrix.builder.vsn }}-${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -19,18 +19,19 @@ on:
 
 jobs:
   mac:
+    name: macOS (${{ matrix.os }} ${{ matrix.otp }})
     strategy:
       fail-fast: false
       matrix:
+        os:
+          - macos-13
+          - macos-14
+          - macos-15
         otp:
           - "26.2.5.14-1"
           - "27.3.4.2-1"
         rebar3:
           - "3.22.0"
-        os:
-          - macos-13
-          - macos-14
-          - macos-15
     runs-on: ${{ matrix.os }}
     steps:
       - uses: emqx/macos-erlang@f744c98139c0db83a10619587d4bae4fc49765a8 # v1.0.0
@@ -58,17 +59,10 @@ jobs:
             _packages/*.tar.gz.sha256
 
   linux:
+    name: linux (${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.builder.otp }})
     strategy:
       fail-fast: false
       matrix:
-        builder:
-          - vsn: "5.5-5:1.15.7-26.2.5.14-1"
-            otp: "26.2.5.14-1"
-          - vsn: "5.5-5:1.18.3-27.3.4.2-1"
-            otp: "27.3.4.2-1"
-        arch:
-          - amd64
-          - arm64
         os:
           - ubuntu24.04
           - ubuntu22.04
@@ -82,10 +76,17 @@ jobs:
           - el8
           - el9
           - alpine3.15.1
+        arch:
+          - amd64
+          - arm64
+        builder:
+          - vsn: "5.5-5:1.15.7-26.2.5.14-1"
+            otp: "26.2.5.14-1"
+          - vsn: "5.5-5:1.18.3-27.3.4.2-1"
+            otp: "27.3.4.2-1"
 
-    runs-on: ubuntu-latest
-    env:
-      IMAGE: ghcr.io/emqx/emqx-builder/${{ matrix.builder.vsn }}-${{ matrix.os }}
+    runs-on: ubuntu-24.04${{ matrix.arch == 'arm64' && '-arm' || '' }}
+    container: ghcr.io/emqx/emqx-builder/${{ matrix.builder.vsn }}-${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -94,21 +95,75 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.event.inputs.build_from }} # when input is not given, the event tag is used
 
-      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
-      - uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
+      - run: git config --global --add safe.directory $GITHUB_WORKSPACE
+
+      - name: build release
+        env:
+          BUILD_RELEASE: 1
+          CI_RELEASE_VERSION: ${{ github.event.inputs.release_as }}
+        run: ./build.sh
+
+      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        with:
+          name: packages-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.builder.otp }}
+          path: |
+            _packages/*.tar.gz
+            _packages/*.tar.gz.sha256
+
+  linux-old:
+    # el7 does not work when using 'container' due to old nodejs version
+    # same with amzn2, plus it needs even more handholding
+    name: linux (${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.builder.otp }})
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - amzn2
+          - el7
+        arch:
+          - amd64
+          - arm64
+        builder:
+          - vsn: "5.5-5:1.15.7-26.2.5.14-1"
+            otp: "26.2.5.14-1"
+          - vsn: "5.5-5:1.18.3-27.3.4.2-1"
+            otp: "27.3.4.2-1"
+
+    runs-on: ubuntu-24.04${{ matrix.arch == 'arm64' && '-arm' || '' }}
+
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
-          platforms: ${{ matrix.arch }}
+          submodules: recursive
+          fetch-depth: 0
+          ref: ${{ github.event.inputs.build_from }} # when input is not given, the event tag is used
 
       - name: build release
         if: matrix.os == 'amzn2'
+        env:
+          CI_RELEASE_VERSION: ${{ github.event.inputs.release_as }}
+          CONTAINER: ghcr.io/emqx/emqx-builder/${{ matrix.builder.vsn }}-${{ matrix.os }}
         run: |
-          docker build --platform=linux/${{ matrix.arch }} --build-arg FROM=$IMAGE -t emqx-builder:amzn2 -f .ci/Dockerfile.amzn2 .
-          docker run -i --rm --user 1001 -v $(pwd):/wd --workdir /wd --platform=linux/${{ matrix.arch }} -e BUILD_RELEASE=1 -e CI_RELEASE_VERSION=${{ github.event.inputs.release_as }} emqx-builder:amzn2 bash -euc './build.sh'
+          docker build --build-arg FROM=$CONTAINER -t emqx-builder:amzn2 -f .ci/Dockerfile.amzn2 .
+          docker run -t --rm --user 1001 \
+            -v $(pwd):/wd \
+            --workdir /wd \
+            -e BUILD_RELEASE=1 \
+            -e CI_RELEASE_VERSION=$CI_RELEASE_VERSION \
+            emqx-builder:amzn2 bash -euc './build.sh'
 
       - name: build release
         if: matrix.os != 'amzn2'
+        env:
+          CI_RELEASE_VERSION: ${{ github.event.inputs.release_as }}
+          CONTAINER: ghcr.io/emqx/emqx-builder/${{ matrix.builder.vsn }}-${{ matrix.os }}
         run: |
-          docker run -i --rm --user 1001 -v $(pwd):/wd --workdir /wd --platform=linux/${{ matrix.arch }} -e BUILD_RELEASE=1 -e CI_RELEASE_VERSION=${{ github.event.inputs.release_as }} $IMAGE bash -euc './build.sh'
+          docker run -t --rm --user 1001 \
+            -v $(pwd):/wd \
+            --workdir /wd \
+            -e BUILD_RELEASE=1 \
+            -e CI_RELEASE_VERSION=$CI_RELEASE_VERSION \
+            $CONTAINER bash -euc './build.sh'
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
@@ -122,6 +177,7 @@ jobs:
     needs:
       - mac
       - linux
+      - linux-old
     if: startsWith(github.ref, 'refs/tags/') || inputs.release_as
     steps:
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG FROM=ghcr.io/emqx/emqx-builder/5.1-3:1.14.5-25.3.2-1-amzn2`
	`1`	`+ARG FROM=ghcr.io/emqx/emqx-builder/5.5-5:1.18.3-27.3.4.2-1-amzn2`
`2`	`2`	`FROM ${FROM}`
`3`	`3`
`4`	`4`	`RUN alternatives --set python /usr/bin/python2 && \`