Skip to content

Commit

Permalink
Update Mac environment files to use human-readable label
Browse files Browse the repository at this point in the history
  • Loading branch information
garrettmflynn committed May 7, 2024
1 parent 69fbddf commit dc7bc17
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Build-and-deploy-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: nwb-guide
environment-file: environments/environment-MAC-arm64.yml
environment-file: environments/environment-MAC-apple.yml
auto-activate-base: false

- uses: actions/setup-node@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pyflask-build-and-dist-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ jobs:

- python-version: "3.9"
os: macos-latest # Mac arm64 runner
label: environments/environment-MAC-arm64.yml
label: environments/environment-MAC-apple.yml
prefix: /Users/runner/miniconda3/envs/nwb-guide

- python-version: "3.9"
os: macos-13 # Mac x64 runner
label: environments/environment-MAC.yml
label: environments/environment-MAC-intel.yml
prefix: /Users/runner/miniconda3/envs/nwb-guide

- python-version: "3.9"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testing-live-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
label: environments/environment-Linux.yml

- os: macos-latest # Mac arm64 runner
label: environments/environment-MAC-arm64.yml
label: environments/environment-MAC-apple.yml

- os: macos-13 # Mac x64 runner
label: environments/environment-MAC.yml
label: environments/environment-MAC-intel.yml

- os: windows-latest
label: environments/environment-Windows.yml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ jobs:
label: environments/environment-Linux.yml

- os: macos-latest # Mac arm64 runner
label: environments/environment-MAC-arm64.yml
label: environments/environment-MAC-apple.yml

- os: macos-13 # Mac x64 runner
label: environments/environment-MAC.yml
label: environments/environment-MAC-intel.yml

- os: windows-latest
label: environments/environment-Windows.yml
Expand Down
4 changes: 2 additions & 2 deletions docs/developer_guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ Install the appropriate Python dependencies for your operating system.

.. code-block:: bash
conda env create -f ./environments/environment-MAC.yml
conda env create -f ./environments/environment-MAC-intel.yml
**Mac with arm64 architecture**

.. code-block:: bash
conda env create -f ./environments/environment-MAC-arm64.yml
conda env create -f ./environments/environment-MAC-apple.yml
**Linux**

Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit dc7bc17

Please sign in to comment.