Skip to content

Commit f7c59b0

Browse files
Clean up OSX Github Action tests (#4272)
1 parent 14b2beb commit f7c59b0

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

.github/workflows/run-tests-monitor.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ jobs:
6767
strategy:
6868
matrix:
6969
python-version: ["3.12", "3.13"]
70-
architecture: ["x64"] # need to force Intel, arm64 builds have issues
7170
fail-fast: false
7271
name: OSX Python ${{ matrix.python-version }}
7372
steps:
@@ -92,8 +91,10 @@ jobs:
9291
python -V 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/python_version.txt
9392
- name: Inspect environment
9493
run: conda list
95-
- name: Install git
96-
run: mamba install -c conda-forge git
94+
- name: Determine if git
95+
run: |
96+
which git
97+
git --version
9798
- name: Install pytest-monitor
9899
run: pip install pytest-monitor
99100
- name: Install ESMValTool

.github/workflows/test.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
python-version: ${{ matrix.python-version }}
3535
miniforge-version: "latest"
3636
use-mamba: true
37-
mamba-version: "2.0.8" # https://github.com/conda-incubator/setup-miniconda/issues/392
3837
- run: mkdir -p test_linux_artifacts_python_${{ matrix.python-version }}
3938
- name: Record versions
4039
run: |
@@ -69,7 +68,6 @@ jobs:
6968
strategy:
7069
matrix:
7170
python-version: ["3.12", "3.13"]
72-
architecture: ["x64"] # need to force Intel, arm64 builds have issues
7371
fail-fast: false
7472
name: OSX Python ${{ matrix.python-version }}
7573
steps:
@@ -84,7 +82,6 @@ jobs:
8482
python-version: ${{ matrix.python-version }}
8583
miniforge-version: "latest"
8684
use-mamba: true
87-
mamba-version: "2.0.5" # https://github.com/conda-incubator/setup-miniconda/issues/392
8885
# - name: Install libomp with homebrew
8986
# run: brew install libomp
9087
- run: mkdir -p test_osx_artifacts_python_${{ matrix.python-version }}
@@ -98,8 +95,6 @@ jobs:
9895
run: |
9996
which git
10097
git --version
101-
- name: Install git
102-
run: mamba install -c conda-forge git
10398
- name: Install ESMValTool
10499
run: pip install --no-deps -e .[develop] 2>&1 | tee test_osx_artifacts_python_${{ matrix.python-version }}/install.txt
105100
- name: Inspect environment

0 commit comments

Comments
 (0)