From aba2ffe65271c266df724f89bd402269bd8cbed7 Mon Sep 17 00:00:00 2001 From: Adriano dos Santos Fernandes Date: Tue, 16 Jan 2024 07:07:48 -0300 Subject: [PATCH] MacOS ARM64 build (#7957). --- .github/workflows/main.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d9ff827780..d4d27163e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -270,7 +270,17 @@ jobs: builds/install_images/Firebird-*-windows-${{ matrix.platform }}*.zip build-macos: - runs-on: macos-12 + name: build-macos-${{ matrix.arch }} + runs-on: ${{ (matrix.arch == 'arm64' && 'flyci-macos-large-latest-m1') || 'macos-12' }} + + strategy: + fail-fast: false + matrix: + arch: + - x64 + - arm64 + exclude: + - arch: ${{ (github.event.head_commit.message == 'increment build number' || github.ref_type == 'tag') && 'dummy' || 'arm64' }} steps: - name: Checkout @@ -319,15 +329,15 @@ jobs: - name: Upload installer uses: actions/upload-artifact@main with: - name: firebird-macos + name: firebird-macos-${{ matrix.arch }} path: gen/artifacts - name: Create release uses: ./.github/actions/create-release with: token: ${{ secrets.SNAPSHOT_RELEASE_TOKEN }} - deletePatterns: Firebird-*-macos-x64*.pkg - uploadFiles: gen/artifacts/Firebird-*-macos-x64*.pkg + deletePatterns: Firebird-*-macos-${{ matrix.arch }}*.pkg + uploadFiles: gen/artifacts/Firebird-*-macos-${{ matrix.arch }}*.pkg build-android-initial: name: build-android-${{ matrix.arch }}-initial