build: fix profile detection when building packages

This commit is contained in:
Ivan Dyachkov 2022-09-28 17:58:06 +02:00
parent 046eb727cd
commit d07a39eafd
2 changed files with 21 additions and 16 deletions

View File

@ -1,6 +1,6 @@
name: 'Create MacOS package' name: 'Create MacOS package'
inputs: inputs:
profile: # emqx, emqx-enterprise profile: # emqx, emqx-ee
required: true required: true
type: string type: string
otp: # 24.2.1-1, 23.3.4.9-3 otp: # 24.2.1-1, 23.3.4.9-3

View File

@ -5,16 +5,31 @@ on:
workflow_dispatch: workflow_dispatch:
jobs: jobs:
prepare:
outputs:
profiles: ${{ steps.detect-profiles.outputs.profiles}}
steps:
- uses: actions/checkout@v1
- name: fix-git-unsafe-repository
run: git config --global --add safe.directory /__w/emqx/emqx
- id: detect-profiles
uses: ./.github/actions/detect-profiles
with:
ci_git_token: ${{ secrets.CI_GIT_TOKEN }}
build: build:
runs-on: ${{ matrix.runs-on }} runs-on: ${{ matrix.runs-on }}
needs: prepare
strategy: strategy:
matrix: matrix:
profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
otp: otp:
- erl23.3.4.9-3 - erl23.3.4.9-3
os: os:
- ubuntu20.04 - ubuntu20.04
- centos7 - centos7
runs-on: runs-on:
- aws-amd64 - aws-amd64
- ubuntu-20.04 - ubuntu-20.04
@ -29,12 +44,6 @@ jobs:
container: emqx/build-env:${{ matrix.otp }}-${{ matrix.os }} container: emqx/build-env:${{ matrix.otp }}-${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v1
- uses: ./.github/actions/detect-profiles
with:
ci_git_token: ${{ secrets.CI_GIT_TOKEN }}
- name: fix-git-unsafe-repository
run: git config --global --add safe.directory /__w/emqx/emqx
- uses: actions/cache@v2 - uses: actions/cache@v2
with: with:
# dialyzer PLTs # dialyzer PLTs
@ -63,20 +72,16 @@ jobs:
path: _packages/**/*.zip path: _packages/**/*.zip
mac: mac:
needs: prepare
strategy: strategy:
matrix: matrix:
profile: profile: ${{fromJSON(needs.prepare.outputs.profiles)}}
- emqx
otp: otp:
- 23.3.4.9-3 - 23.3.4.9-3
os: os:
- macos-11 - macos-11
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:
- uses: actions/checkout@v1
- uses: ./.github/actions/detect-profiles
with:
ci_git_token: ${{ secrets.CI_GIT_TOKEN }}
- uses: ./.github/actions/package-macos - uses: ./.github/actions/package-macos
with: with:
profile: ${{ matrix.profile }} profile: ${{ matrix.profile }}