Merge pull request #764 from NeurodataWithoutBorders/rly-patch-1

NeurodataWithoutBorders · Apr 25, 2024 · a411e2f · a411e2f
2 parents ae3d20d + 6f67d8d
commit a411e2f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml
@@ -1,5 +1,6 @@
 name: Mac Release
 run-name: ${{ github.actor }} is building a MAC release for NWB GUIDE
+# NOTE: even though the runner is an arm64 mac, both x64 and arm64 releases will be made
 
 on:
   workflow_dispatch:
@@ -22,7 +23,7 @@ jobs:
       - uses: conda-incubator/setup-miniconda@v2
         with:
           activate-environment: nwb-guide
-          environment-file: environments/environment-MAC.yml
+          environment-file: environments/environment-MAC-arm64.yml
           auto-activate-base: false
 
       - uses: actions/setup-node@v3

diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml
@@ -32,8 +32,13 @@ jobs:
           #   prefix: /usr/share/miniconda3/envs/nwb-guide
 
           - python-version: "3.9"
-            os: macos-latest
-            label: environments/environment-Mac.yml
+            os: macos-latest  # Mac arm64 runner
+            label: environments/environment-MAC-arm64.yml
+            prefix: /Users/runner/miniconda3/envs/nwb-guide
+
+          - python-version: "3.9"
+            os: macos-13  # Mac x64 runner
+            label: environments/environment-MAC.yml
             prefix: /Users/runner/miniconda3/envs/nwb-guide
 
           - python-version: "3.9"
@@ -45,6 +50,9 @@ jobs:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow --tags
 
+      - name: Printout architecture
+        run: uname -m
+
       # see https://github.com/conda-incubator/setup-miniconda#caching-environments
       - name: Setup Mambaforge
         uses: conda-incubator/setup-miniconda@v3
@@ -81,7 +89,7 @@ jobs:
       - run: npm ci --verbose
 
       # fix for macos build
-      - if: matrix.os == 'macos-latest'
+      - if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
         run: rm -f /Users/runner/miniconda3/envs/nwb-guide/lib/python3.9/site-packages/sonpy/linux/sonpy.so
 
       - name: Build PyFlask distribution

diff --git a/.github/workflows/testing-live-services.yml b/.github/workflows/testing-live-services.yml
@@ -27,8 +27,11 @@ jobs:
           - os: ubuntu-latest
             label: environments/environment-Linux.yml
 
-          - os: macos-latest
-            label: environments/environment-Mac.yml
+          - os: macos-latest  # Mac arm64 runner
+            label: environments/environment-MAC-arm64.yml
+
+          - os: macos-13  # Mac x64 runner
+            label: environments/environment-MAC.yml
 
           - os: windows-latest
             label: environments/environment-Windows.yml

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -27,8 +27,11 @@ jobs:
           - os: ubuntu-latest
             label: environments/environment-Linux.yml
 
-          - os: macos-latest
-            label: environments/environment-Mac.yml
+          - os: macos-latest  # Mac arm64 runner
+            label: environments/environment-MAC-arm64.yml
+
+          - os: macos-13  # Mac x64 runner
+            label: environments/environment-MAC.yml
 
           - os: windows-latest
             label: environments/environment-Windows.yml