Parcourir la source

ci: avoid using 'include' for elixir builds

prior to this change the elixir builds matrix dimensions were 'included'
cusing it to build for enterprise eidtion

use exclude instead.

also removed otp from the artifact upload name, leave only profile,
so there is no need to 'include' with a '-windows' suffix for
windows package uploads
Zaiming (Stone) Shi il y a 3 ans
Parent
commit
c3777e4920
1 fichiers modifiés avec 22 ajouts et 34 suppressions
  1. 22 34
      .github/workflows/build_packages.yaml

+ 22 - 34
.github/workflows/build_packages.yaml

@@ -93,8 +93,6 @@ jobs:
       matrix:
         profile: # for now only CE for windows
           - emqx
-        otp:
-          - 24.2.1
     steps:
     - uses: actions/download-artifact@v3
       with:
@@ -105,7 +103,7 @@ jobs:
     - uses: ilammy/msvc-dev-cmd@v1.12.0
     - uses: erlef/setup-beam@v1
       with:
-        otp-version: ${{ matrix.otp }}
+        otp-version: 24.2.1
     - name: build
       env:
         PYTHON: python
@@ -130,7 +128,7 @@ jobs:
         echo "EMQX uninstalled"
     - uses: actions/upload-artifact@v3
       with:
-        name: ${{ matrix.profile }}-windows
+        name: ${{ matrix.profile }}
         path: source/_packages/${{ matrix.profile }}/
 
   mac:
@@ -169,7 +167,7 @@ jobs:
         apple_developer_id_bundle_password: ${{ secrets.APPLE_DEVELOPER_ID_BUNDLE_PASSWORD }}
     - uses: actions/upload-artifact@v3
       with:
-        name: ${{ matrix.profile }}-${{ matrix.otp }}
+        name: ${{ matrix.profile }}
         path: _packages/${{ matrix.profile }}/
 
   linux:
@@ -184,7 +182,7 @@ jobs:
         profile:
           - ${{ needs.prepare.outputs.BUILD_PROFILE }}
         otp:
-          - 24.3.4.2-1 # we test with OTP 23, but only build package on OTP 24 versions
+          - 24.3.4.2-1
         elixir:
           - 1.13.4
         # used to split elixir packages into a separate job, since the
@@ -202,36 +200,31 @@ jobs:
         os:
           - ubuntu20.04
           - ubuntu18.04
-          - ubuntu16.04
           - debian11
           - debian10
-          - debian9
           - el8
           - el7
         build_machine:
           - aws-arm64
           - ubuntu-20.04
         exclude:
-        - arch: arm64
-          build_machine: ubuntu-20.04
-        - arch: amd64
-          build_machine: aws-arm64
-        include:
-          - profile: emqx
-            otp: 24.3.4.2-1
-            elixir: 1.13.4
-            build_elixir: with_elixir
-            arch: amd64
-            os: ubuntu20.04
-            build_machine: ubuntu-20.04
-          - profile: emqx
-            otp: 24.3.4.2-1
-            elixir: 1.13.4
-            build_elixir: with_elixir
-            arch: amd64
-            os: el8
+          - arch: arm64
             build_machine: ubuntu-20.04
-
+          - arch: amd64
+            build_machine: aws-arm64
+            # elixir: only for opensource edition and only on ubuntu20.04 and el8 on amd64
+          - build_elixir: with_elixir
+            profile: emqx-enterprise
+          - build_elixir: with_elixir
+            arch: arm64
+          - build_elixir: with_elixir
+            os: ubuntu18.04
+          - build_elixir: with_elixir
+            os: debian10
+          - build_elixir: with_elixir
+            os: debian11
+          - build_elixir: with_elixir
+            os: el7
     defaults:
       run:
         shell: bash
@@ -280,7 +273,7 @@ jobs:
         done
     - uses: actions/upload-artifact@v3
       with:
-        name: ${{ matrix.profile }}-${{ matrix.otp }}
+        name: ${{ matrix.profile }}
         path: source/_packages/${{ matrix.profile }}/
 
   publish_artifacts:
@@ -292,15 +285,10 @@ jobs:
       matrix:
         profile:
           - ${{ needs.prepare.outputs.BUILD_PROFILE }}
-        otp:
-          - 24.3.4.2-1
-        include:
-          - profile: emqx
-            otp: windows # otp version on windows is rather fixed
     steps:
     - uses: actions/download-artifact@v3
       with:
-        name: ${{ matrix.profile }}-${{ matrix.otp }}
+        name: ${{ matrix.profile }}
         path: packages/${{ matrix.profile }}
     - name: install dos2unix
       run: sudo apt-get update && sudo apt install -y dos2unix