From 262814bf02dc03ad30e040328126577808ac4447 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Wed, 16 Oct 2024 17:36:59 +0200 Subject: [PATCH] darwin-highsierra-x86_64 and darwin-bigsur-aarch64 --- .github/workflows/clingo.yml | 6 ++++-- .github/workflows/gnupg.yml | 7 ++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/clingo.yml b/.github/workflows/clingo.yml index fa9e0f1..d289c7b 100644 --- a/.github/workflows/clingo.yml +++ b/.github/workflows/clingo.yml @@ -21,11 +21,12 @@ env: jobs: macos_clingo: - runs-on: ${{ matrix.runner }} + runs-on: ${{ matrix.runner[0] }} strategy: matrix: python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] - runner: ["macos-13", "macos-14"] + # runner + macOS deployment target + runner: [["macos-13", "10.13"], ["macos-14", "11"]] steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v4 @@ -33,6 +34,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Prepare Spack run: | + export MACOSX_DEPLOYMENT_TARGET=${{ matrix.runner[1] }} pip install --upgrade pip brew install bison export PATH="$(brew --prefix bison):$PATH" diff --git a/.github/workflows/gnupg.yml b/.github/workflows/gnupg.yml index b7500df..4592091 100644 --- a/.github/workflows/gnupg.yml +++ b/.github/workflows/gnupg.yml @@ -26,15 +26,16 @@ jobs: # List of: # 1. Runners # 2. Target architectures + # 3. macOS deployment target matrix: runner: [ - ["macos-13", "x86_64"], - ["macos-14", "aarch64"] + ["macos-13", "x86_64", "10.13"], # highsierra + ["macos-14", "aarch64", "11"] # bigsur ] steps: - uses: actions/checkout@v4 - run: | - export MACOSX_DEPLOYMENT_TARGET=10.13 + export MACOSX_DEPLOYMENT_TARGET=${{ matrix.runner[2] }} brew install gawk perl git clone https://github.com/spack/spack.git git -C spack checkout -b docker-reference c710a1597f3566ab850d0ee8c82e71af04a08f9e