From 7a554effee4da5e1fda786fdbc823762f7f35bea Mon Sep 17 00:00:00 2001 From: Anton Korobeynikov Date: Mon, 29 Apr 2024 21:38:17 -0700 Subject: [PATCH] Be explicit with OS settings. Also try to workaround https://github.com/Homebrew/homebrew-core/issues/169820 --- .github/workflows/release.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4d966308..8ae0d74d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -115,7 +115,11 @@ jobs: build-mac: strategy: matrix: - os: [macos-13, macos-14] + include: + - os: macos-13 + arch: x86_64 + - os: macos-14 + arch: arm64 name: '🍎 Build SPAdes for macOS' runs-on: ${{ matrix.os }} @@ -139,7 +143,7 @@ jobs: - name: '⚙️ Install dependencies' run: > - brew install llvm libomp + brew install llvm libomp bzip2 - name: '⚙️ Configure CMake' run: > @@ -149,6 +153,7 @@ jobs: -DSPADES_USE_NCBISDK=ON -DSPADES_ENABLE_PROJECTS=all -DCMAKE_C_COMPILER=$(brew --prefix llvm)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm)/bin/clang++ + -DCMAKE_EXE_LINKER_FLAGS=-L$(brew --prefix llvm)/lib/c++ - name: '🚧 Build' run: > @@ -160,7 +165,7 @@ jobs: - name: '📦 Package' uses: actions/upload-artifact@v4 with: - name: build-artifacts-mac-${{ matrix.os }} + name: build-artifacts-mac-${{ matrix.arch }} path: | ${{env.BUILD_DIR}}/${{env.PKG_MAC}}.tar.gz @@ -168,10 +173,14 @@ jobs: name: '🚬 E. coli 1k smoke checks' strategy: matrix: - os: [macos-13, macos-14] + include: + - os: macos-13 + arch: x86_64 + - os: macos-14 + arch: arm64 runs-on: ${{ matrix.os }} - + needs: build-mac steps: @@ -184,7 +193,7 @@ jobs: - name: '📦 Download package' uses: actions/download-artifact@v4 with: - name: build-artifacts-mac-${{ matrix.os }} + name: build-artifacts-mac-${{ matrix.arch }} path: ${{env.INSTALL_DIR}} - name: '📦 Unpack package'