Skip to content

Commit 8068fa0

Browse files
Merge pull request #1120 from reef-technologies/macos-14
Do not use deprecated macos-13 runner in CI
2 parents 57f8bae + 0593cc3 commit 8068fa0

File tree

3 files changed

+12
-22
lines changed

3 files changed

+12
-22
lines changed

.github/workflows/cd.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Continuous Delivery
22

33
on:
44
push:
5-
tags: 'v*' # push events to matching v*, i.e. v1.0, v20.15.10
5+
tags: ['v*'] # push events to matching v*, i.e. v1.0, v20.15.10
66

77
env:
88
CD: "true"
@@ -32,7 +32,7 @@ jobs:
3232
with:
3333
fetch-depth: 0
3434
- name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
35-
uses: actions/setup-python@v5
35+
uses: actions/setup-python@v6
3636
with:
3737
python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
3838
- name: Install dependencies
@@ -110,7 +110,7 @@ jobs:
110110
with:
111111
fetch-depth: 0
112112
- name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
113-
uses: actions/setup-python@v5
113+
uses: actions/setup-python@v6
114114
with:
115115
python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
116116
- name: Install dependencies
@@ -155,7 +155,7 @@ jobs:
155155
with:
156156
fetch-depth: 0
157157
- name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
158-
uses: actions/setup-python@v5
158+
uses: actions/setup-python@v6
159159
with:
160160
python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
161161
- name: Install dependencies

.github/workflows/ci.yml

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
with:
2222
ignore_words_list: datas re-use
2323
- name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
24-
uses: actions/setup-python@v5
24+
uses: actions/setup-python@v6
2525
with:
2626
python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
2727
- name: Install dependencies
@@ -43,7 +43,7 @@ jobs:
4343
with:
4444
fetch-depth: 0
4545
- name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
46-
uses: actions/setup-python@v5
46+
uses: actions/setup-python@v6
4747
with:
4848
python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
4949
- name: Install dependencies
@@ -64,7 +64,7 @@ jobs:
6464
fetch-depth: 0
6565
- name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
6666
if: ${{ env.B2_TEST_APPLICATION_KEY != '' && env.B2_TEST_APPLICATION_KEY_ID != '' }} # TODO: skip this whole job instead
67-
uses: actions/setup-python@v5
67+
uses: actions/setup-python@v6
6868
with:
6969
python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
7070
cache: "pip"
@@ -92,23 +92,12 @@ jobs:
9292
python-version: "pypy3.10"
9393
- os: "windows-latest"
9494
python-version: "pypy3.10"
95-
# Workaround for https://github.com/actions/setup-python/issues/696
96-
- os: "macos-latest"
97-
python-version: 3.8
98-
- os: "macos-latest"
99-
python-version: 3.9
100-
include:
101-
# Workaround for https://github.com/actions/setup-python/issues/696
102-
- os: "macos-13"
103-
python-version: 3.8
104-
- os: "macos-13"
105-
python-version: 3.9
10695
steps:
10796
- uses: actions/checkout@v4
10897
with:
10998
fetch-depth: 0
11099
- name: Set up Python ${{ matrix.python-version }}
111-
uses: actions/setup-python@v5
100+
uses: actions/setup-python@v6
112101
with:
113102
python-version: ${{ matrix.python-version }}
114103
- name: Install test binary dependencies
@@ -144,7 +133,7 @@ jobs:
144133
with:
145134
fetch-depth: 0
146135
- name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
147-
uses: actions/setup-python@v5
136+
uses: actions/setup-python@v6
148137
with:
149138
python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
150139
- name: Install dependencies
@@ -224,7 +213,7 @@ jobs:
224213
with:
225214
fetch-depth: 0
226215
- name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
227-
uses: actions/setup-python@v5
216+
uses: actions/setup-python@v6
228217
with:
229218
python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
230219
- name: Install dependencies
@@ -258,7 +247,7 @@ jobs:
258247
with:
259248
fetch-depth: 0
260249
- name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
261-
uses: actions/setup-python@v5
250+
uses: actions/setup-python@v6
262251
with:
263252
python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
264253
- name: Install dependencies
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update CI to not use deprecated `macos-13` runner.

0 commit comments

Comments
 (0)