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
This commit is contained in:
Zaiming (Stone) Shi 2022-11-20 09:06:54 +01:00
parent 03d3d1d65a
commit c3777e4920
1 changed files with 22 additions and 34 deletions

View File

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