Skip to content

Commit 868f50a

Browse files
authored
Update actions versions to Node 20 (#94)
1 parent cb1ab60 commit 868f50a

File tree

1 file changed

+49
-20
lines changed

1 file changed

+49
-20
lines changed

.github/workflows/dist.yml

Lines changed: 49 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- uses: actions/checkout@v4
4242
- uses: psf/black@stable
4343

44-
- uses: actions/setup-python@v4
44+
- uses: actions/setup-python@v5
4545
with:
4646
python-version: "3.12"
4747

@@ -79,7 +79,7 @@ jobs:
7979
- uses: actions/checkout@v4
8080
with:
8181
fetch-depth: 0
82-
- uses: actions/setup-python@v4
82+
- uses: actions/setup-python@v5
8383
with:
8484
python-version: ${{ matrix.python_version }}
8585

@@ -123,11 +123,40 @@ jobs:
123123
RPYBUILD_STRIP_LIBPYTHON: "1"
124124
RPYBUILD_CC_LAUNCHER: ccache
125125

126-
- uses: actions/upload-artifact@v3
126+
- uses: actions/upload-artifact@v4
127127
with:
128-
name: "dist-${{ runner.os }}"
128+
name: "dist-${{ runner.os }}-${{ matrix.python_version }}"
129129
path: dist
130130

131+
merge:
132+
runs-on: ubuntu-latest
133+
needs: [cross-build, build]
134+
steps:
135+
- name: Merge Windows Artifacts
136+
uses: actions/upload-artifact/merge@v4
137+
with:
138+
name: dist-Windows
139+
pattern: dist-Windows*
140+
delete-merged: true
141+
- name: Merge Linux Artifacts
142+
uses: actions/upload-artifact/merge@v4
143+
with:
144+
name: dist-Linux
145+
pattern: dist-Linux*
146+
delete-merged: true
147+
- name: Merge macOS Artifacts
148+
uses: actions/upload-artifact/merge@v4
149+
with:
150+
name: dist-macOS
151+
pattern: dist-macOS*
152+
delete-merged: true
153+
- name: Merge raspbian Artifacts
154+
uses: actions/upload-artifact/merge@v4
155+
with:
156+
name: dist-raspbian
157+
pattern: dist-raspbian*
158+
delete-merged: true
159+
131160
#
132161
# Build roboRIO/raspbian wheels
133162
#
@@ -143,26 +172,26 @@ jobs:
143172
name: roborio
144173

145174
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py38
146-
name: raspbian
175+
name: raspbian-py38
147176
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py39
148-
name: raspbian
177+
name: raspbian-py39
149178
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py310
150-
name: raspbian
179+
name: raspbian-py310
151180
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py311
152-
name: raspbian
181+
name: raspbian-py311
153182
- container: wpilib/raspbian-cross-ubuntu:bullseye-22.04-py312
154-
name: raspbian
183+
name: raspbian-py312
155184

156185
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py38
157-
name: raspbian
186+
name: raspbian-aarch64-py38
158187
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py39
159-
name: raspbian
188+
name: raspbian-aarch64-py39
160189
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py310
161-
name: raspbian
190+
name: raspbian-aarch64-py310
162191
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py311
163-
name: raspbian
192+
name: raspbian-aarch64-py311
164193
- container: wpilib/aarch64-cross-ubuntu:bullseye-22.04-py312
165-
name: raspbian
194+
name: raspbian-aarch64-py312
166195

167196
container:
168197
image: "${{ matrix.os.container }}"
@@ -206,7 +235,7 @@ jobs:
206235
RPYBUILD_STRIP_LIBPYTHON: "1"
207236
RPYBUILD_CC_LAUNCHER: ccache
208237

209-
- uses: actions/upload-artifact@v3
238+
- uses: actions/upload-artifact@v4
210239
with:
211240
name: dist-${{ matrix.os.name }}
212241
path: dist
@@ -221,12 +250,12 @@ jobs:
221250
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
222251

223252
steps:
224-
- uses: actions/download-artifact@v3
253+
- uses: actions/download-artifact@v4
225254
with:
226255
name: dist-roborio
227256
path: dist/
228257

229-
- uses: actions/download-artifact@v3
258+
- uses: actions/download-artifact@v4
230259
with:
231260
name: dist-raspbian
232261
path: dist/
@@ -251,17 +280,17 @@ jobs:
251280
with:
252281
fetch-depth: 0
253282

254-
- uses: actions/download-artifact@v3
283+
- uses: actions/download-artifact@v4
255284
with:
256285
name: dist-Windows
257286
path: dist/
258287

259-
- uses: actions/download-artifact@v3
288+
- uses: actions/download-artifact@v4
260289
with:
261290
name: dist-macOS
262291
path: dist/
263292

264-
- uses: actions/download-artifact@v3
293+
- uses: actions/download-artifact@v4
265294
with:
266295
name: dist-Linux
267296
path: dist/

0 commit comments

Comments
 (0)