Skip to content

Commit

Permalink
Build AMD64 on macos-12 and ARM64 on macos-14
Browse files Browse the repository at this point in the history
  • Loading branch information
iamazeem committed Mar 19, 2024
1 parent 775a0fa commit c29a2b7
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ jobs:
name: ci
strategy:
matrix:
# os: [ubuntu-20.04, macos-12]
os: [macos-14]
os: [ubuntu-20.04, macos-12, macos-14]

runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -54,7 +53,7 @@ jobs:
sudo apt install -y mingw-w64 rpm alien nuget
sudo apt remove -y jq
- name: Set up macOS
- name: Set up macOS (AMD64 and ARM64)
if: runner.os == 'macOS'
run: |
brew install coreutils tree autoconf automake libtool
Expand Down Expand Up @@ -125,7 +124,7 @@ jobs:
./scripts/ci-create-nuget-package.sh
- name: Build on macOS (${{ env.AMD64_MACOSX_GCC }})
if: runner.os == 'macOS'
if: matrix.os == 'macos-12'
env:
PREFIX: ${{ env.AMD64_MACOSX_GCC }}
CC: gcc-11
Expand Down Expand Up @@ -242,7 +241,7 @@ jobs:
if-no-files-found: error

- name: Upload (zsv-${{ env.TAG }}-${{ env.AMD64_MACOSX_GCC }}.zip)
if: runner.os == 'macOS'
if: matrix.os == 'macos-12'
uses: actions/upload-artifact@v4
env:
ARTIFACT_NAME: zsv-${{ env.TAG }}-${{ env.AMD64_MACOSX_GCC }}.zip
Expand Down Expand Up @@ -308,7 +307,7 @@ jobs:
if-no-files-found: error

- name: Upload (zsv-${{ env.TAG }}-${{ env.AMD64_MACOSX_GCC }}.tar.gz)
if: runner.os == 'macOS'
if: matrix.os == 'macos-12'
uses: actions/upload-artifact@v4
env:
ARTIFACT_NAME: zsv-${{ env.TAG }}-${{ env.AMD64_MACOSX_GCC }}.tar.gz
Expand Down Expand Up @@ -356,7 +355,7 @@ jobs:
# --- Update homebrew tap ---

- name: Update homebrew tap (liquidaty/homebrew-zsv)
if: ${{ startsWith(github.ref, 'refs/tags/v') && runner.os == 'macOS' }}
if: ${{ startsWith(github.ref, 'refs/tags/v') && matrix.os == 'macos-12' }}
env:
HOMEBREW_TAP_DEPLOY_KEY: ${{ secrets.HOMEBREW_TAP_DEPLOY_KEY }}
TAG: ${{ env.TAG }}
Expand Down

0 comments on commit c29a2b7

Please sign in to comment.