From 7398eaf3c395fc94a510b2e491b8ace66abad99b Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Wed, 24 Apr 2024 14:43:50 -0700 Subject: [PATCH 01/11] Update Build-and-deploy-mac.yml --- .github/workflows/Build-and-deploy-mac.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml index 450bd74a7..5921647e6 100644 --- a/.github/workflows/Build-and-deploy-mac.yml +++ b/.github/workflows/Build-and-deploy-mac.yml @@ -22,7 +22,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 From da51bf9f635e36fd806fd29c19d25a358e2dc353 Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Wed, 24 Apr 2024 14:54:09 -0700 Subject: [PATCH 02/11] Update testing.yml --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index f5b0e6c49..b7f8ffd0e 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -28,7 +28,7 @@ jobs: label: environments/environment-Linux.yml - os: macos-latest - label: environments/environment-Mac.yml + label: environments/environment-MAC-arm64.yml - os: windows-latest label: environments/environment-Windows.yml From 92566f1b7462e75901bcfee8b5bb35dc1a7712cb Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Wed, 24 Apr 2024 16:55:07 -0500 Subject: [PATCH 03/11] Update env for macos-latest m1 --- .github/workflows/pyflask-build-and-dist-tests.yml | 2 +- .github/workflows/testing-live-services.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index cee21a443..240f82b76 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -33,7 +33,7 @@ jobs: - python-version: "3.9" os: macos-latest - label: environments/environment-Mac.yml + label: environments/environment-MAC-arm64.yml prefix: /Users/runner/miniconda3/envs/nwb-guide - python-version: "3.9" diff --git a/.github/workflows/testing-live-services.yml b/.github/workflows/testing-live-services.yml index 1169c03d8..dbd115c79 100644 --- a/.github/workflows/testing-live-services.yml +++ b/.github/workflows/testing-live-services.yml @@ -28,7 +28,7 @@ jobs: label: environments/environment-Linux.yml - os: macos-latest - label: environments/environment-Mac.yml + label: environments/environment-MAC-arm64.yml - os: windows-latest label: environments/environment-Windows.yml From 4bb8a23521d802c8089de34c5a2e130124502184 Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Thu, 25 Apr 2024 00:45:21 -0500 Subject: [PATCH 04/11] Add mac x64 workflows --- .github/workflows/Build-and-deploy-mac.yml | 1 + .github/workflows/pyflask-build-and-dist-tests.yml | 5 +++++ .github/workflows/testing-live-services.yml | 3 +++ .github/workflows/testing.yml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml index 5921647e6..31b72078b 100644 --- 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: diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index 240f82b76..05848358b 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -36,6 +36,11 @@ jobs: label: environments/environment-MAC-arm64.yml prefix: /Users/runner/miniconda3/envs/nwb-guide + - python-version: "3.9" + os: macos-13 + label: environments/environment-MAC.yml + prefix: /Users/runner/miniconda3/envs/nwb-guide + - python-version: "3.9" os: windows-latest label: environments/environment-Windows.yml diff --git a/.github/workflows/testing-live-services.yml b/.github/workflows/testing-live-services.yml index dbd115c79..a5c5a2c7c 100644 --- a/.github/workflows/testing-live-services.yml +++ b/.github/workflows/testing-live-services.yml @@ -30,6 +30,9 @@ jobs: - os: macos-latest label: environments/environment-MAC-arm64.yml + - os: macos-13 + 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 index b7f8ffd0e..1eb200ae8 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -30,6 +30,9 @@ jobs: - os: macos-latest label: environments/environment-MAC-arm64.yml + - os: macos-13 + label: environments/environment-MAC.yml + - os: windows-latest label: environments/environment-Windows.yml From 822057ae17088df60976e43c8ab90d2b67bded2e Mon Sep 17 00:00:00 2001 From: Ryan Ly Date: Thu, 25 Apr 2024 00:46:52 -0500 Subject: [PATCH 05/11] Add comments --- .github/workflows/pyflask-build-and-dist-tests.yml | 4 ++-- .github/workflows/testing-live-services.yml | 4 ++-- .github/workflows/testing.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index 05848358b..badf1553e 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -32,12 +32,12 @@ jobs: # prefix: /usr/share/miniconda3/envs/nwb-guide - python-version: "3.9" - os: macos-latest + 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 + os: macos-13 # Mac x64 runner label: environments/environment-MAC.yml prefix: /Users/runner/miniconda3/envs/nwb-guide diff --git a/.github/workflows/testing-live-services.yml b/.github/workflows/testing-live-services.yml index a5c5a2c7c..975c7478e 100644 --- a/.github/workflows/testing-live-services.yml +++ b/.github/workflows/testing-live-services.yml @@ -27,10 +27,10 @@ jobs: - os: ubuntu-latest label: environments/environment-Linux.yml - - os: macos-latest + - os: macos-latest # Mac arm64 runner label: environments/environment-MAC-arm64.yml - - os: macos-13 + - os: macos-13 # Mac x64 runner label: environments/environment-MAC.yml - os: windows-latest diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 1eb200ae8..9d22c5c28 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -27,10 +27,10 @@ jobs: - os: ubuntu-latest label: environments/environment-Linux.yml - - os: macos-latest + - os: macos-latest # Mac arm64 runner label: environments/environment-MAC-arm64.yml - - os: macos-13 + - os: macos-13 # Mac x64 runner label: environments/environment-MAC.yml - os: windows-latest From 1ac510f730d7134e5cd857ac37df850d4c551950 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 05:48:03 +0000 Subject: [PATCH 06/11] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/pyflask-build-and-dist-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index badf1553e..bc16e925a 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -37,7 +37,7 @@ jobs: prefix: /Users/runner/miniconda3/envs/nwb-guide - python-version: "3.9" - os: macos-13 # Mac x64 runner + os: macos-13 # Mac x64 runner label: environments/environment-MAC.yml prefix: /Users/runner/miniconda3/envs/nwb-guide From 4b8238f737013c910180bddd39b17fc5cec7affc Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Thu, 25 Apr 2024 11:42:23 -0400 Subject: [PATCH 07/11] try 12 --- .github/workflows/pyflask-build-and-dist-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index bc16e925a..8e528468c 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -37,7 +37,7 @@ jobs: prefix: /Users/runner/miniconda3/envs/nwb-guide - python-version: "3.9" - os: macos-13 # Mac x64 runner + os: macos-12 # Mac x64 runner label: environments/environment-MAC.yml prefix: /Users/runner/miniconda3/envs/nwb-guide From ecfc0310da0824605a2b41b29b0ab49f71191ab5 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:02:08 -0400 Subject: [PATCH 08/11] try other alias --- .github/workflows/pyflask-build-and-dist-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index 8e528468c..a78139ed1 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -32,12 +32,12 @@ jobs: # prefix: /usr/share/miniconda3/envs/nwb-guide - python-version: "3.9" - os: macos-latest # Mac arm64 runner + os: macos-latest-xlarge # Mac arm64 runner label: environments/environment-MAC-arm64.yml prefix: /Users/runner/miniconda3/envs/nwb-guide - python-version: "3.9" - os: macos-12 # Mac x64 runner + os: macos-latest-large # Mac x64 runner label: environments/environment-MAC.yml prefix: /Users/runner/miniconda3/envs/nwb-guide From 2766e42c0b37f6e58de1c0aac7559d55ff5d5d48 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:16:13 -0400 Subject: [PATCH 09/11] try printing architecture --- .github/workflows/pyflask-build-and-dist-tests.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index a78139ed1..b31e32e3f 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -32,13 +32,13 @@ jobs: # prefix: /usr/share/miniconda3/envs/nwb-guide - python-version: "3.9" - os: macos-latest-xlarge # Mac arm64 runner + 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-latest-large # Mac x64 runner - label: environments/environment-MAC.yml + os: macos-13 # Mac x64 runner + label: environments/environment-MAC-arm64.yml prefix: /Users/runner/miniconda3/envs/nwb-guide - python-version: "3.9" @@ -50,6 +50,9 @@ jobs: - uses: actions/checkout@v4 - run: git fetch --prune --unshallow --tags + - name: Printout architecture + run: echo uname -m + # see https://github.com/conda-incubator/setup-miniconda#caching-environments - name: Setup Mambaforge uses: conda-incubator/setup-miniconda@v3 From 0d500bea14e43822b046787e494ec0e1055f2a0c Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:25:30 -0400 Subject: [PATCH 10/11] remove echo --- .github/workflows/pyflask-build-and-dist-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index b31e32e3f..983d87f87 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -51,7 +51,7 @@ jobs: - run: git fetch --prune --unshallow --tags - name: Printout architecture - run: echo uname -m + run: uname -m # see https://github.com/conda-incubator/setup-miniconda#caching-environments - name: Setup Mambaforge From 6f67d8dc1ca57f353ecff72b81dd6d8df71b9777 Mon Sep 17 00:00:00 2001 From: Cody Baker <51133164+CodyCBakerPhD@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:30:52 -0400 Subject: [PATCH 11/11] fix sonpy removal condition --- .github/workflows/pyflask-build-and-dist-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pyflask-build-and-dist-tests.yml b/.github/workflows/pyflask-build-and-dist-tests.yml index 983d87f87..bbf9e4f93 100644 --- a/.github/workflows/pyflask-build-and-dist-tests.yml +++ b/.github/workflows/pyflask-build-and-dist-tests.yml @@ -38,7 +38,7 @@ jobs: - python-version: "3.9" os: macos-13 # Mac x64 runner - label: environments/environment-MAC-arm64.yml + label: environments/environment-MAC.yml prefix: /Users/runner/miniconda3/envs/nwb-guide - python-version: "3.9" @@ -89,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