Skip to content

Commit a73cc7c

Browse files
indygregindygreg
committed
ci: use latest actions versions / move SDK checkout
Let's stay modern. As part of this I moved the checkout for the macOS SDKs to just before the validation step. This lets us get build results faster. No sense waiting for a Git checkout only needed at validation time.
1 parent 5699fd2 commit a73cc7c

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

‎.github/workflows/apple.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
default: true
1616
profile: minimal
1717

18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
with:
2020
repository: mozilla/sccache
2121
# Update cache key if this changes.
2222
ref: e6326bc8a20ee06af37e16a3a7a14e3374c66c66
2323
fetch-depth: 0
2424

25-
- uses: actions/cache@v2
25+
- uses: actions/cache@v3
2626
with:
2727
path: |
2828
~/.cargo/registry
@@ -35,15 +35,15 @@ jobs:
3535
cargo build --release
3636
3737
- name: Upload sccache executable
38-
uses: actions/upload-artifact@v2
38+
uses: actions/upload-artifact@v3
3939
with:
4040
name: sccache
4141
path: target/release/sccache
4242

4343
pythonbuild:
4444
runs-on: 'macos-11'
4545
steps:
46-
- uses: actions/checkout@v2
46+
- uses: actions/checkout@v3
4747

4848
- name: Install Rust
4949
uses: actions-rs/toolchain@v1
@@ -52,7 +52,7 @@ jobs:
5252
default: true
5353
profile: minimal
5454

55-
- uses: actions/cache@v2
55+
- uses: actions/cache@v3
5656
with:
5757
path: |
5858
~/.cargo/registry
@@ -65,7 +65,7 @@ jobs:
6565
cargo build --release
6666
6767
- name: Upload pythonbuild Executable
68-
uses: actions/upload-artifact@v2
68+
uses: actions/upload-artifact@v3
6969
with:
7070
name: pythonbuild
7171
path: target/release/pythonbuild
@@ -81,15 +81,15 @@ jobs:
8181
SCCACHE_S3_USE_SSL: '1'
8282
SCCACHE_IDLE_TIMEOUT: '0'
8383
steps:
84-
- uses: actions/checkout@v2
84+
- uses: actions/checkout@v3
8585

8686
- name: Install Python
8787
uses: actions/setup-python@v2
8888
with:
8989
python-version: '3.9'
9090

9191
- name: Download sccache
92-
uses: actions/download-artifact@v2
92+
uses: actions/download-artifact@v3
9393
with:
9494
name: sccache
9595

@@ -107,7 +107,7 @@ jobs:
107107
./sccache -s
108108
109109
- name: Upload Toolchain Archive
110-
uses: actions/upload-artifact@v2
110+
uses: actions/upload-artifact@v3
111111
with:
112112
name: toolchain
113113
path: build/clang-*.tar
@@ -223,25 +223,19 @@ jobs:
223223
with:
224224
fetch-depth: 0
225225

226-
- uses: actions/checkout@v3
227-
with:
228-
repository: 'phracker/MacOSX-SDKs'
229-
ref: master
230-
path: macosx-sdks
231-
232226
- name: Install Python
233227
uses: actions/setup-python@v2
234228
with:
235229
python-version: '3.9'
236230

237231
- name: Download pythonbuild
238-
uses: actions/download-artifact@v2
232+
uses: actions/download-artifact@v3
239233
with:
240234
name: pythonbuild
241235
path: build
242236

243237
- name: Download toolchain
244-
uses: actions/download-artifact@v2
238+
uses: actions/download-artifact@v3
245239
with:
246240
name: toolchain
247241
path: build
@@ -265,6 +259,12 @@ jobs:
265259
266260
./build-macos.py --skip-toolchain --target-triple ${{ matrix.build.target_triple }} --python ${{ matrix.build.py }} --optimizations ${{ matrix.build.optimizations }}
267261
262+
- uses: actions/checkout@v3
263+
with:
264+
repository: 'phracker/MacOSX-SDKs'
265+
ref: master
266+
path: macosx-sdks
267+
268268
- name: Validate Distribution
269269
run: |
270270
chmod +x build/pythonbuild
@@ -276,7 +276,7 @@ jobs:
276276
build/pythonbuild validate-distribution --macos-sdks-path macosx-sdks ${EXTRA_ARGS} dist/*.tar.zst
277277
278278
- name: Upload Distributions
279-
uses: actions/upload-artifact@v2
279+
uses: actions/upload-artifact@v3
280280
with:
281281
name: ${{ matrix.build.py }}-${{ matrix.build.target_triple }}
282282
path: dist/*

‎.github/workflows/linux.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ jobs:
2222
default: true
2323
profile: minimal
2424

25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v3
2626
with:
2727
repository: indygreg/sccache
2828
ref: b0eae3f0d174b81e7582159cb9329dbea0af25c9
2929
fetch-depth: 0
3030

31-
- uses: actions/cache@v2
31+
- uses: actions/cache@v3
3232
with:
3333
path: |
3434
~/.cargo/registry
@@ -41,7 +41,7 @@ jobs:
4141
cargo build --release --target x86_64-unknown-linux-musl
4242
4343
- name: Upload sccache executable
44-
uses: actions/upload-artifact@v2
44+
uses: actions/upload-artifact@v3
4545
with:
4646
name: sccache
4747
path: target/x86_64-unknown-linux-musl/release/sccache
@@ -54,7 +54,7 @@ jobs:
5454
sudo apt update
5555
sudo apt install -y --no-install-recommends libssl-dev pkg-config
5656
57-
- uses: actions/checkout@v2
57+
- uses: actions/checkout@v3
5858

5959
- name: Install Rust
6060
uses: actions-rs/toolchain@v1
@@ -63,7 +63,7 @@ jobs:
6363
default: true
6464
profile: minimal
6565

66-
- uses: actions/cache@v2
66+
- uses: actions/cache@v3
6767
with:
6868
path: |
6969
~/.cargo/registry
@@ -76,7 +76,7 @@ jobs:
7676
cargo build --release
7777
7878
- name: Upload pythonbuild Executable
79-
uses: actions/upload-artifact@v2
79+
uses: actions/upload-artifact@v3
8080
with:
8181
name: pythonbuild
8282
path: target/release/pythonbuild
@@ -92,15 +92,15 @@ jobs:
9292
SCCACHE_S3_USE_SSL: '1'
9393
SCCACHE_IDLE_TIMEOUT: '0'
9494
steps:
95-
- uses: actions/checkout@v2
95+
- uses: actions/checkout@v3
9696

9797
- name: Install Python
9898
uses: actions/setup-python@v2
9999
with:
100100
python-version: '3.9'
101101

102102
- name: Download sccache
103-
uses: actions/download-artifact@v2
103+
uses: actions/download-artifact@v3
104104
with:
105105
name: sccache
106106

@@ -118,7 +118,7 @@ jobs:
118118
./sccache -s
119119
120120
- name: Upload Toolchain Archive
121-
uses: actions/upload-artifact@v2
121+
uses: actions/upload-artifact@v3
122122
with:
123123
name: toolchain
124124
path: build/*.tar
@@ -504,7 +504,7 @@ jobs:
504504
- toolchain
505505
runs-on: 'ubuntu-20.04'
506506
steps:
507-
- uses: actions/checkout@v2
507+
- uses: actions/checkout@v3
508508
with:
509509
fetch-depth: 0
510510

@@ -514,13 +514,13 @@ jobs:
514514
python-version: '3.9'
515515

516516
- name: Download pythonbuild
517-
uses: actions/download-artifact@v2
517+
uses: actions/download-artifact@v3
518518
with:
519519
name: pythonbuild
520520
path: build
521521

522522
- name: Download toolchain
523-
uses: actions/download-artifact@v2
523+
uses: actions/download-artifact@v3
524524
with:
525525
name: toolchain
526526
path: build
@@ -535,7 +535,7 @@ jobs:
535535
build/pythonbuild validate-distribution dist/*.tar.zst
536536
537537
- name: Upload Distribution
538-
uses: actions/upload-artifact@v2
538+
uses: actions/upload-artifact@v3
539539
with:
540540
name: ${{ matrix.build.py }}-${{ matrix.build.target_triple }}
541541
path: dist/*

‎.github/workflows/windows.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
pythonbuild:
88
runs-on: 'windows-2019'
99
steps:
10-
- uses: actions/checkout@v2
10+
- uses: actions/checkout@v3
1111

1212
- name: Install Rust
1313
uses: actions-rs/toolchain@v1
@@ -16,7 +16,7 @@ jobs:
1616
default: true
1717
profile: minimal
1818

19-
- uses: actions/cache@v2
19+
- uses: actions/cache@v3
2020
with:
2121
path: |
2222
C:/Rust/.cargo/registry
@@ -29,7 +29,7 @@ jobs:
2929
cargo build --release
3030
3131
- name: Upload executable
32-
uses: actions/upload-artifact@v2
32+
uses: actions/upload-artifact@v3
3333
with:
3434
name: pythonbuild
3535
path: target/release/pythonbuild.exe
@@ -51,7 +51,7 @@ jobs:
5151
needs: pythonbuild
5252
runs-on: 'windows-2019'
5353
steps:
54-
- uses: actions/checkout@v2
54+
- uses: actions/checkout@v3
5555
with:
5656
fetch-depth: 0
5757

@@ -67,7 +67,7 @@ jobs:
6767
python-version: '3.9'
6868

6969
- name: Download pythonbuild Executable
70-
uses: actions/download-artifact@v2
70+
uses: actions/download-artifact@v3
7171
with:
7272
name: pythonbuild
7373

@@ -89,7 +89,7 @@ jobs:
8989
.\pythonbuild.exe validate-distribution --run $Dists
9090
9191
- name: Upload Distributions
92-
uses: actions/upload-artifact@v2
92+
uses: actions/upload-artifact@v3
9393
with:
9494
name: ${{ matrix.py }}-${{ matrix.vcvars }}
9595
path: dist/*

0 commit comments

Comments
 (0)