ci: fix missed issues

This commit is contained in:
Ivan Dyachkov 2023-07-20 18:09:50 +02:00
parent e3e28d9b41
commit c7d68ed25d
3 changed files with 37 additions and 5 deletions

View File

@ -11,9 +11,9 @@ jobs:
runs-on: ${{ github.repository_owner == 'emqx' && 'aws-amd64' || 'ubuntu-22.04' }}
container: ghcr.io/emqx/emqx-builder/5.1-3:1.14.5-25.3.2-1-ubuntu22.04
outputs:
ct-matrix: ${{ steps.matrix.outputs.matrix }}
ct-host: ${{ steps.matrix.outputs.host }}
ct-docker: ${{ steps.matrix.outputs.docker }}
ct-matrix: ${{ steps.matrix.outputs.ct-matrix }}
ct-host: ${{ steps.matrix.outputs.ct-host }}
ct-docker: ${{ steps.matrix.outputs.ct-docker }}
version-emqx: ${{ steps.matrix.outputs.version-emqx }}
version-emqx-enterprise: ${{ steps.matrix.outputs.version-emqx-enterprise }}

View File

@ -54,10 +54,9 @@ jobs:
- name: extract artifact
run: |
unzip -o -q $EMQX_NAME.zip
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: build and export to Docker
run: |
docker build -t emqx/$EMQX_NAME:test --build-arg EMQX_NAME=$EMQX_NAME -f ./deploy/docker/Dockerfile .
docker build -t $EMQX_IMAGE_TAG --build-arg EMQX_NAME=$EMQX_NAME -f ./deploy/docker/Dockerfile .
- name: smoke test
run: |
CID=$(docker run -d --rm -P $EMQX_IMAGE_TAG)

View File

@ -85,6 +85,39 @@ jobs:
scripts/spellcheck
_build/docgen/${{ matrix.profile[0] }}/schema-en.json
mac:
strategy:
fail-fast: false
matrix:
profile:
- emqx
- emqx-enterprise
otp:
- 25.3.2-1
os:
- macos-11
- macos-12-arm64
runs-on: ${{ matrix.os }}
env:
EMQX_NAME: ${{ matrix.profile }}
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/package-macos
with:
profile: ${{ matrix.profile }}
otp: ${{ matrix.otp }}
os: ${{ matrix.os }}
apple_id_password: ${{ secrets.APPLE_ID_PASSWORD }}
apple_developer_identity: ${{ secrets.APPLE_DEVELOPER_IDENTITY }}
apple_developer_id_bundle: ${{ secrets.APPLE_DEVELOPER_ID_BUNDLE }}
apple_developer_id_bundle_password: ${{ secrets.APPLE_DEVELOPER_ID_BUNDLE_PASSWORD }}
- uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os }}
path: _packages/**/*
windows:
runs-on: windows-2019
strategy: