From 170e14f34854065251711d9174bac471a0a247df Mon Sep 17 00:00:00 2001
From: jaimergp <jaimergp@users.noreply.github.com>
Date: Tue, 23 Apr 2024 15:16:32 +0200
Subject: [PATCH 1/3] Be explicit about runner choices on macOS

---
 .github/workflows/main.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index eba3db1d7..76babc288 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,51 +33,51 @@ defaults:
 jobs:
   tests:
     name: ${{ matrix.os }}, Python ${{ matrix.python-version }}, ${{ matrix.conda-standalone }}
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         include:
           # UBUNTU
-          - os: ubuntu
+          - os: ubuntu-latest
             python-version: "3.8"
             conda-standalone: conda-standalone
             check-docs: true
-          - os: ubuntu
+          - os: ubuntu-latest
             python-version: "3.9"
             conda-standalone: conda-standalone
             check-docs: true
-          - os: ubuntu
+          - os: ubuntu-latest
             python-version: "3.10"
             conda-standalone: conda-standalone-nightly
-          - os: ubuntu
+          - os: ubuntu-latest
             python-version: "3.11"
             conda-standalone: micromamba
           # MACOS
-          - os: macos
+          - os: macos-13
             python-version: "3.8"
             conda-standalone: conda-standalone-nightly
           # Not running for 3.9 to save some CI resources
           # - os: macos
           #   python-version: "3.9"
           #   conda-standalone: conda-standalone
-          - os: macos
+          - os: macos-13
             python-version: "3.10"
             conda-standalone: micromamba
-          - os: macos
+          - os: macos-13
             python-version: "3.11"
             conda-standalone: conda-standalone
           # WINDOWS
-          - os: windows
+          - os: windows-latest
             python-version: "3.8"
             conda-standalone: conda-standalone
-          - os: windows
+          - os: windows-latest
             python-version: "3.9"
             conda-standalone: conda-standalone-nightly
-          - os: windows
+          - os: windows-latest
             python-version: "3.10"
             conda-standalone: conda-standalone
-          - os: windows
+          - os: windows-latest
             python-version: "3.11"
             # conda-standalone: micromamba
             conda-standalone: conda-standalone-nightly
@@ -173,8 +173,10 @@ jobs:
         include:
           - runner: ubuntu-latest
             subdir: linux-64
-          - runner: macos-latest
+          - runner: macos-13
             subdir: osx-64
+          - runner: macos-14  # FUTURE: Use latest
+            subdir: osx-arm64
           - runner: windows-latest
             subdir: win-64
     runs-on: ${{ matrix.runner }}

From 62c801236c89a69ad5b009464730ff29474b8a2f Mon Sep 17 00:00:00 2001
From: jaimergp <jaimergp@users.noreply.github.com>
Date: Wed, 24 Apr 2024 10:06:54 +0200
Subject: [PATCH 2/3] use setup-miniconda v3

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 76babc288..045e8d726 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -89,7 +89,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: constructor-dev
           environment-file: dev/environment.yml

From 87fe8a3dc15303af753bd679cea197b19f360801 Mon Sep 17 00:00:00 2001
From: jaimergp <jaimergp@users.noreply.github.com>
Date: Wed, 24 Apr 2024 10:20:28 +0200
Subject: [PATCH 3/3] use runner.os

---
 .github/workflows/main.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 045e8d726..c732eaf55 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -97,8 +97,8 @@ jobs:
       - name: Supply extra dependencies and install constructor
         run: |
           files=(--file "tests/requirements.txt")
-          test -f dev/extra-requirements-${{ matrix.os }}.txt \
-            && files+=(--file "dev/extra-requirements-${{ matrix.os }}.txt")
+          test -f dev/extra-requirements-${{ runner.os }}.txt \
+            && files+=(--file "dev/extra-requirements-${{ runner.os }}.txt")
           conda install ${files[@]} -y
           echo "NSIS_USING_LOG_BUILD=1" >> $GITHUB_ENV
           pip install -e . --no-deps --no-build-isolation
@@ -106,7 +106,7 @@ jobs:
         run: |
           if [[ "${{ matrix.conda-standalone }}" == "micromamba" ]]; then
             conda create -yqp "${{ runner.temp }}/micromamba" -c conda-forge micromamba
-            if [[ ${{ matrix.os }} == "windows" ]]; then
+            if [[ "${{ runner.os }}" == "Windows" ]]; then
               echo "CONSTRUCTOR_CONDA_EXE=${{ runner.temp }}/micromamba/Library/bin/micromamba.exe" >> $GITHUB_ENV
             else
               echo "CONSTRUCTOR_CONDA_EXE=${{ runner.temp }}/micromamba/bin/micromamba" >> $GITHUB_ENV