Skip to content

Commit 567c418

Browse files
authored
Fix macOS CI runner (alisw#891)
1 parent 771e866 commit 567c418

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.github/workflows/pr-check.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ jobs:
6060
6161
- name: Upload coverage information
6262
if: ${{ always() && github.event.repository.owner.login == 'alisw' }}
63-
uses: codecov/codecov-action@v3
63+
uses: codecov/codecov-action@v5
6464
with:
6565
files: coverage.json
6666

6767
mac-unittest:
6868
name: mac-python${{ matrix.python-version }}
69-
runs-on: macos-latest
69+
runs-on: macos-14
7070

7171
strategy:
7272
fail-fast: false # continue executing other checks if one fails
@@ -75,15 +75,18 @@ jobs:
7575
- '3.11'
7676

7777
steps:
78-
- uses: actions/checkout@v3
78+
- uses: actions/checkout@v4
7979

8080
- name: Set up Python ${{ matrix.python-version }}
81-
uses: actions/setup-python@v4
81+
uses: actions/setup-python@v5
8282
with:
8383
python-version: ${{ matrix.python-version }}
8484

8585
- name: Install test dependencies
8686
run: |
87+
# Hack to remove whatever the CI default image brings now, as it
88+
# conflicts with the one in o2-full-deps [O2-5580]
89+
brew uninstall --ignore-dependencies --force [email protected]
8790
brew install modules alisw/system-deps/o2-full-deps sapling
8891
python3 -m pip install --upgrade tox tox-gh-actions coverage
8992
@@ -102,7 +105,7 @@ jobs:
102105
103106
- name: Upload coverage information
104107
if: ${{ always() && github.event.repository.owner.login == 'alisw' }}
105-
uses: codecov/codecov-action@v3
108+
uses: codecov/codecov-action@v5
106109
with:
107110
files: coverage.json
108111

@@ -111,10 +114,10 @@ jobs:
111114
runs-on: ubuntu-latest
112115

113116
steps:
114-
- uses: actions/checkout@v3
117+
- uses: actions/checkout@v4
115118

116119
- name: Set up Python
117-
uses: actions/setup-python@v4
120+
uses: actions/setup-python@v5
118121
with:
119122
python-version: 3.x
120123

0 commit comments

Comments
 (0)