Skip to content

Commit c74f71c

Browse files
adriwebadriweb
committed
[CI] update Ubuntu 20.04 to 22.04 and use v4 artifact related actions
GitHub is deprecating this Ubuntu version, and upload/download-artifact@v3 are not supported anymore.
1 parent 9257fd0 commit c74f71c

File tree

2 files changed

+42
-41
lines changed

2 files changed

+42
-41
lines changed

‎.github/workflows/cmake-windows.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,31 +61,31 @@ jobs:
6161
cmake --build build --config ${{matrix.build-type}} --target install
6262
cmake -E copy build/include/llvm/Config/config.h llvm/include/llvm/Config
6363
- name: Upload LLVM
64-
uses: actions/upload-artifact@v3
64+
uses: actions/upload-artifact@v4
6565
with:
6666
name: LLVM${{matrix.runs-on}}${{matrix.build-type}}
6767
path: llvm
6868

6969
- name: Install ez80-link
7070
run: cmake -E copy llvm/bin/llvm-link${{env.EXE}} ez80-link${{env.EXE}}
7171
- name: Upload ez80-link
72-
uses: actions/upload-artifact@v3
72+
uses: actions/upload-artifact@v4
7373
with:
7474
name: ez80-link${{env.EXE}}-${{matrix.runs-on}}${{matrix.build-type}}
7575
path: ez80-link${{env.EXE}}
7676

7777
- name: Install ez80-lto
7878
run: cmake -E copy llvm/bin/llvm-lto${{env.EXE}} ez80-lto${{env.EXE}}
7979
- name: Upload ez80-lto
80-
uses: actions/upload-artifact@v3
80+
uses: actions/upload-artifact@v4
8181
with:
8282
name: ez80-lto${{env.EXE}}-${{matrix.runs-on}}${{matrix.build-type}}
8383
path: ez80-lto${{env.EXE}}
8484

8585
- name: Install ez80-lto2
8686
run: cmake -E copy llvm/bin/llvm-lto2${{env.EXE}} ez80-lto2${{env.EXE}}
8787
- name: Upload ez80-lto2
88-
uses: actions/upload-artifact@v3
88+
uses: actions/upload-artifact@v4
8989
with:
9090
name: ez80-lto2${{env.EXE}}-${{matrix.runs-on}}${{matrix.build-type}}
9191
path: ez80-lto2${{env.EXE}}
@@ -139,7 +139,7 @@ jobs:
139139
git sparse-checkout set cmake third-party clang
140140
141141
- name: Download LLVM
142-
uses: actions/download-artifact@v3
142+
uses: actions/download-artifact@v4
143143
with:
144144
name: LLVM${{matrix.runs-on}}${{matrix.build-type}}
145145
path: llvm
@@ -153,7 +153,7 @@ jobs:
153153
- name: Install Clang
154154
run: cmake --build build --config ${{matrix.build-type}} --target install
155155
- name: Upload Clang
156-
uses: actions/upload-artifact@v3
156+
uses: actions/upload-artifact@v4
157157
with:
158158
name: Clang${{matrix.runs-on}}${{matrix.build-type}}
159159
path: clang
@@ -163,7 +163,7 @@ jobs:
163163
- name: Test ez80-clang
164164
run: cmake -E echo "void test(void){}" | ./ez80-clang${{env.EXE}} -S -xc - -o -
165165
- name: Upload ez80-clang
166-
uses: actions/upload-artifact@v3
166+
uses: actions/upload-artifact@v4
167167
with:
168168
name: ez80-clang${{env.EXE}}-${{matrix.runs-on}}${{matrix.build-type}}
169169
path: ez80-clang${{env.EXE}}
@@ -178,12 +178,12 @@ jobs:
178178

179179
steps:
180180
- name: Download Windows ez80-clang
181-
uses: actions/download-artifact@v3
181+
uses: actions/download-artifact@v4
182182
with:
183183
name: ez80-clang.exe-windows-latestRelease
184184
path: ${{github.workspace}}
185185
- name: Download Windows ez80-link
186-
uses: actions/download-artifact@v3
186+
uses: actions/download-artifact@v4
187187
with:
188188
name: ez80-link.exe-windows-latestRelease
189189
path: ${{github.workspace}}

‎.github/workflows/cmake.yml

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
runs-on: [ubuntu-20.04, ubuntu-latest, macos-13, macos-14]
13+
runs-on: [ubuntu-22.04, ubuntu-latest, macos-13, macos-14]
1414
build-type: [Release]
1515
runs-on: ${{matrix.runs-on}}
1616
steps:
@@ -67,7 +67,7 @@ jobs:
6767
cmake --build build --config ${{matrix.build-type}} --target install
6868
cmake -E copy build/include/llvm/Config/config.h llvm/include/llvm/Config
6969
- name: Upload LLVM
70-
uses: actions/upload-artifact@v3
70+
uses: actions/upload-artifact@v4
7171
with:
7272
name: LLVM${{matrix.runs-on}}${{matrix.build-type}}
7373
path: llvm
@@ -77,7 +77,7 @@ jobs:
7777
- name: Strip ez80-link
7878
run: strip ez80-link${{env.EXE}}
7979
- name: Upload ez80-link
80-
uses: actions/upload-artifact@v3
80+
uses: actions/upload-artifact@v4
8181
with:
8282
name: ez80-link${{env.EXE}}-${{matrix.runs-on}}${{matrix.build-type}}
8383
path: ez80-link${{env.EXE}}
@@ -87,7 +87,7 @@ jobs:
8787
- name: Strip ez80-lto
8888
run: strip ez80-lto${{env.EXE}}
8989
- name: Upload ez80-lto
90-
uses: actions/upload-artifact@v3
90+
uses: actions/upload-artifact@v4
9191
with:
9292
name: ez80-lto${{env.EXE}}-${{matrix.runs-on}}${{matrix.build-type}}
9393
path: ez80-lto${{env.EXE}}
@@ -97,7 +97,7 @@ jobs:
9797
- name: Strip ez80-lto2
9898
run: strip ez80-lto2${{env.EXE}}
9999
- name: Upload ez80-lto2
100-
uses: actions/upload-artifact@v3
100+
uses: actions/upload-artifact@v4
101101
with:
102102
name: ez80-lto2${{env.EXE}}-${{matrix.runs-on}}${{matrix.build-type}}
103103
path: ez80-lto2${{env.EXE}}
@@ -117,7 +117,7 @@ jobs:
117117
cmake -E copy build/tools/clang/test/Unit/lit.site.cfg.py test/tools/clang/test/Unit
118118
cmake -E copy build/unittests/Target/Z80/Z80Tests${{env.EXE}} test/unittests/Target/Z80
119119
- name: Upload Test
120-
uses: actions/upload-artifact@v3
120+
uses: actions/upload-artifact@v4
121121
with:
122122
name: Test${{matrix.runs-on}}${{matrix.build-type}}
123123
path: test
@@ -130,7 +130,7 @@ jobs:
130130
strategy:
131131
fail-fast: false
132132
matrix:
133-
runs-on: [ubuntu-20.04, ubuntu-latest, macos-13, macos-14]
133+
runs-on: [ubuntu-22.04, ubuntu-latest, macos-13, macos-14]
134134
build-type: [Release]
135135
runs-on: ${{matrix.runs-on}}
136136
steps:
@@ -178,7 +178,7 @@ jobs:
178178
git sparse-checkout set cmake third-party clang
179179
180180
- name: Download LLVM
181-
uses: actions/download-artifact@v3
181+
uses: actions/download-artifact@v4
182182
with:
183183
name: LLVM${{matrix.runs-on}}${{matrix.build-type}}
184184
path: llvm
@@ -194,7 +194,7 @@ jobs:
194194
- name: Install Clang
195195
run: cmake --build build --config ${{matrix.build-type}} --target install
196196
- name: Upload Clang
197-
uses: actions/upload-artifact@v3
197+
uses: actions/upload-artifact@v4
198198
with:
199199
name: Clang${{matrix.runs-on}}${{matrix.build-type}}
200200
path: clang
@@ -206,23 +206,24 @@ jobs:
206206
- name: Test ez80-clang
207207
run: cmake -E echo "void test(void){}" | ./ez80-clang${{env.EXE}} -S -xc - -o -
208208
- name: Upload ez80-clang
209-
uses: actions/upload-artifact@v3
209+
uses: actions/upload-artifact@v4
210210
with:
211211
name: ez80-clang${{env.EXE}}-${{matrix.runs-on}}${{matrix.build-type}}
212212
path: ez80-clang${{env.EXE}}
213213

214214
- name: Download Test
215-
uses: actions/download-artifact@v3
215+
uses: actions/download-artifact@v4
216216
with:
217217
name: Test${{matrix.runs-on}}${{matrix.build-type}}
218218
path: test
219219
- name: Install Test
220220
run: cmake -E copy build/bin/arcmt-test${{env.EXE}} build/bin/c-arcmt-test${{env.EXE}} build/bin/clang-diff${{env.EXE}} build/bin/clang-tblgen${{env.EXE}} test/bin
221221
- name: Upload Test
222-
uses: actions/upload-artifact@v3
222+
uses: actions/upload-artifact@v4
223223
with:
224224
name: Test${{matrix.runs-on}}${{matrix.build-type}}
225225
path: test
226+
overwrite: true
226227

227228
- name: Disk Usage
228229
run: df -h
@@ -232,7 +233,7 @@ jobs:
232233
strategy:
233234
fail-fast: false
234235
matrix:
235-
runs-on: [ubuntu-20.04, ubuntu-latest, macos-13, macos-14]
236+
runs-on: [ubuntu-22.04, ubuntu-latest, macos-13, macos-14]
236237
build-type: [Release]
237238
runs-on: ${{matrix.runs-on}}
238239
steps:
@@ -252,12 +253,12 @@ jobs:
252253
git sparse-checkout set cmake llvm/test llvm/utils/lit/lit llvm/unittest third-party
253254
254255
- name: Download Test
255-
uses: actions/download-artifact@v3
256+
uses: actions/download-artifact@v4
256257
with:
257258
name: Test${{matrix.runs-on}}${{matrix.build-type}}
258259
path: build
259260
- name: Download LLVM
260-
uses: actions/download-artifact@v3
261+
uses: actions/download-artifact@v4
261262
with:
262263
name: LLVM${{matrix.runs-on}}${{matrix.build-type}}
263264
path: build
@@ -274,7 +275,7 @@ jobs:
274275
strategy:
275276
fail-fast: false
276277
matrix:
277-
runs-on: [ubuntu-20.04, ubuntu-latest, macos-13, macos-14]
278+
runs-on: [ubuntu-22.04, ubuntu-latest, macos-13, macos-14]
278279
build-type: [Debug]
279280
continue-on-error: true
280281
if: false
@@ -296,12 +297,12 @@ jobs:
296297
git sparse-checkout set cmake third-party llvm/test llvm/utils/lit/lit
297298
298299
- name: Download Test
299-
uses: actions/download-artifact@v3
300+
uses: actions/download-artifact@v4
300301
with:
301302
name: Test${{matrix.runs-on}}${{matrix.build-type}}
302303
path: build
303304
- name: Download LLVM
304-
uses: actions/download-artifact@v3
305+
uses: actions/download-artifact@v4
305306
with:
306307
name: LLVM${{matrix.runs-on}}${{matrix.build-type}}
307308
path: build
@@ -316,7 +317,7 @@ jobs:
316317
strategy:
317318
fail-fast: false
318319
matrix:
319-
runs-on: [ubuntu-20.04, ubuntu-latest, macos-13, macos-14]
320+
runs-on: [ubuntu-22.04, ubuntu-latest, macos-13, macos-14]
320321
build-type: [Debug]
321322
continue-on-error: true
322323
if: false
@@ -338,17 +339,17 @@ jobs:
338339
git sparse-checkout set cmake third-party clang/test llvm/utils/lit/lit
339340
340341
- name: Download Test
341-
uses: actions/download-artifact@v3
342+
uses: actions/download-artifact@v4
342343
with:
343344
name: Test${{matrix.runs-on}}${{matrix.build-type}}
344345
path: build
345346
- name: Download LLVM
346-
uses: actions/download-artifact@v3
347+
uses: actions/download-artifact@v4
347348
with:
348349
name: LLVM${{matrix.runs-on}}${{matrix.build-type}}
349350
path: build
350351
- name: Download Clang
351-
uses: actions/download-artifact@v3
352+
uses: actions/download-artifact@v4
352353
with:
353354
name: Clang${{matrix.runs-on}}${{matrix.build-type}}
354355
path: build
@@ -364,28 +365,28 @@ jobs:
364365
if: github.ref == 'refs/heads/z80'
365366

366367
steps:
367-
- name: Download Ubuntu 20.04 ez80-clang
368-
uses: actions/download-artifact@v3
368+
- name: Download Ubuntu 22.04 ez80-clang
369+
uses: actions/download-artifact@v4
369370
with:
370-
name: ez80-clang-ubuntu-20.04Release
371+
name: ez80-clang-ubuntu-22.04Release
371372
path: ${{github.workspace}}
372-
- name: Download Ubuntu 20.04 ez80-link
373-
uses: actions/download-artifact@v3
373+
- name: Download Ubuntu 22.04 ez80-link
374+
uses: actions/download-artifact@v4
374375
with:
375-
name: ez80-link-ubuntu-20.04Release
376+
name: ez80-link-ubuntu-22.04Release
376377
path: ${{github.workspace}}
377378
- name: chmod and zip Ubuntu Artifacts
378379
run: |
379380
chmod +x ez80-clang ez80-link
380381
zip ez80-clang-link_ubuntu_nightly.zip ez80-clang ez80-link
381382
rm ez80-clang ez80-link
382383
- name: Download macOS 13 ez80-clang
383-
uses: actions/download-artifact@v3
384+
uses: actions/download-artifact@v4
384385
with:
385386
name: ez80-clang-macos-13Release
386387
path: ${{github.workspace}}
387388
- name: Download macOS 13 ez80-link
388-
uses: actions/download-artifact@v3
389+
uses: actions/download-artifact@v4
389390
with:
390391
name: ez80-link-macos-13Release
391392
path: ${{github.workspace}}
@@ -395,12 +396,12 @@ jobs:
395396
zip ez80-clang-link_macOS_intel_nightly.zip ez80-clang ez80-link
396397
rm ez80-clang ez80-link
397398
- name: Download macOS 14 ez80-clang
398-
uses: actions/download-artifact@v3
399+
uses: actions/download-artifact@v4
399400
with:
400401
name: ez80-clang-macos-14Release
401402
path: ${{github.workspace}}
402403
- name: Download macOS 14 ez80-link
403-
uses: actions/download-artifact@v3
404+
uses: actions/download-artifact@v4
404405
with:
405406
name: ez80-link-macos-14Release
406407
path: ${{github.workspace}}

0 commit comments

Comments
 (0)