Skip to content

Commit c8db422

Browse files
benbrandtbenbrandt
committed
Update action versions
1 parent 0002320 commit c8db422

File tree

2 files changed

+40
-62
lines changed

2 files changed

+40
-62
lines changed

‎.github/workflows/release.yaml

Lines changed: 33 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,29 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929
with:
30-
submodules: 'recursive'
30+
submodules: "recursive"
3131

3232
- uses: actions/setup-python@v4
3333
with:
34-
python-version: '3.12'
34+
python-version: "3.12"
3535

3636
- name: Install latest Rust stable toolchain
37-
uses: actions-rs/toolchain@v1
37+
uses: dtolnay/rust-toolchain@stable
3838
with:
39-
toolchain: stable
40-
default: true
39+
targets: wasm32-wasi wasm32-unknown-unknown
4140
components: clippy, rustfmt
4241

4342
- name: Install latest Rust nightly toolchain
44-
uses: actions-rs/toolchain@v1
43+
uses: dtolnay/rust-toolchain@nightly
4544
with:
46-
toolchain: nightly
47-
default: false
45+
targets: wasm32-wasi wasm32-unknown-unknown
4846

4947
- name: Install Rust std source
5048
shell: bash
5149
run: rustup component add rust-src --toolchain nightly
5250

53-
- name: Install Wasm Rust targets
54-
shell: bash
55-
run: rustup target add wasm32-wasi wasm32-unknown-unknown
56-
5751
- uses: Swatinem/rust-cache@v2
5852
with:
5953
shared-key: "rust-cache-${{ hashFiles('./Cargo.lock') }}"
@@ -69,7 +63,7 @@ jobs:
6963
7064
- name: Cache CPython
7165
id: cache-cpython-wasi
72-
uses: actions/cache@v3
66+
uses: actions/cache@v4
7367
with:
7468
path: cpython/builddir/wasi
7569
key: cpython-wasi
@@ -106,7 +100,7 @@ jobs:
106100
buildArgs: "--target aarch64-unknown-linux-gnu",
107101
target: "aarch64-unknown-linux-gnu",
108102
targetDir: "target/aarch64-unknown-linux-gnu/release",
109-
}
103+
}
110104
- {
111105
os: "macos-latest",
112106
arch: "amd64",
@@ -139,36 +133,28 @@ jobs:
139133
}
140134
steps:
141135
- name: Checkout
142-
uses: actions/checkout@v3
136+
uses: actions/checkout@v4
143137
with:
144-
submodules: 'recursive'
138+
submodules: "recursive"
145139

146140
- uses: actions/setup-python@v4
147141
with:
148-
python-version: '3.12'
142+
python-version: "3.12"
149143

150144
- name: Install latest Rust stable toolchain
151-
uses: actions-rs/toolchain@v1
145+
uses: dtolnay/rust-toolchain@stable
152146
with:
153-
toolchain: stable
154-
default: true
155-
target: ${{ matrix.config.target }}
147+
targets: ${{ matrix.config.target }}
156148

157149
- name: Install latest Rust nightly toolchain
158-
uses: actions-rs/toolchain@v1
150+
uses: dtolnay/rust-toolchain@nightly
159151
with:
160-
toolchain: nightly
161-
default: false
162-
target: ${{ matrix.config.target }}
152+
targets: ${{ matrix.config.target }}
163153

164154
- name: Install Rust std source
165155
shell: bash
166156
run: rustup component add rust-src --toolchain nightly
167157

168-
- name: Install Wasm Rust targets
169-
shell: bash
170-
run: rustup target add wasm32-wasi wasm32-unknown-unknown
171-
172158
- uses: Swatinem/rust-cache@v2
173159
if: matrix.config.os == 'ubuntu-latest' && matrix.config.arch == 'amd64'
174160
with:
@@ -211,7 +197,7 @@ jobs:
211197
212198
- name: Restore CPython
213199
id: cache-cpython-wasi
214-
uses: actions/cache/restore@v3
200+
uses: actions/cache/restore@v4
215201
with:
216202
path: cpython/builddir/wasi
217203
key: cpython-wasi
@@ -252,16 +238,16 @@ jobs:
252238
componentize-py${{ matrix.config.extension }}
253239
254240
- name: Upload wheels
255-
uses: actions/upload-artifact@v3
241+
uses: actions/upload-artifact@v4
256242
with:
257243
name: componentize-py
258244
path: dist
259245

260246
- name: Upload build artifact
261-
uses: actions/upload-artifact@v3
247+
uses: actions/upload-artifact@v4
262248
with:
263-
name: componentize-py
264-
path: _dist/componentize-py-${{ env.RELEASE_VERSION }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz
249+
name: componentize-py
250+
path: _dist/componentize-py-${{ env.RELEASE_VERSION }}-${{ env.RUNNER_OS }}-${{ matrix.config.arch }}.tar.gz
265251

266252
- name: Upload binary to Github release (tag)
267253
if: startsWith(github.ref, 'refs/tags/v')
@@ -287,15 +273,15 @@ jobs:
287273
run: echo "RELEASE_VERSION=canary" >> $GITHUB_ENV
288274

289275
- name: Download release assets
290-
uses: actions/download-artifact@v3
276+
uses: actions/download-artifact@v4
291277
with:
292-
name: componentize-py
278+
name: componentize-py
293279

294280
- name: Generate checksums
295281
run: |
296282
sha256sum componentize-py-${{ env.RELEASE_VERSION }}*.tar.gz > checksums-${{ env.RELEASE_VERSION }}.txt
297283
298-
- uses: actions/upload-artifact@v3
284+
- uses: actions/upload-artifact@v4
299285
with:
300286
name: componentize-py
301287
path: checksums-${{ env.RELEASE_VERSION }}.txt
@@ -313,17 +299,17 @@ jobs:
313299
runs-on: ubuntu-latest
314300
steps:
315301
- name: Checkout
316-
uses: actions/checkout@v3
302+
uses: actions/checkout@v4
317303
with:
318-
submodules: 'recursive'
319-
304+
submodules: "recursive"
305+
320306
- name: Build sdist
321307
uses: PyO3/maturin-action@v1
322308
with:
323309
command: sdist
324310
args: --out dist
325311
- name: Upload sdist
326-
uses: actions/upload-artifact@v3
312+
uses: actions/upload-artifact@v4
327313
with:
328314
name: componentize-py
329315
path: dist
@@ -335,19 +321,17 @@ jobs:
335321
runs-on: ubuntu-latest
336322
steps:
337323
- name: Download release assets
338-
uses: actions/download-artifact@v3
324+
uses: actions/download-artifact@v4
339325
with:
340-
name: componentize-py
326+
name: componentize-py
341327

342328
- name: Delete canary tag
343-
uses: dev-drprasad/delete-tag-and-release@v0.2.1
329+
run: gh release delete --cleanup-tag -y
344330
env:
345-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
346-
with:
347-
tag_name: canary
331+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
348332

349333
- name: Recreate canary tag and release
350-
uses: ncipollo/release-action@v1.10.0
334+
uses: ncipollo/release-action@v1
351335
with:
352336
tag: canary
353337
allowUpdates: true

‎.github/workflows/test.yaml

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,29 @@ jobs:
2525
runs-on: ${{ matrix.config.os }}
2626
steps:
2727
- name: Checkout
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929
with:
3030
submodules: "recursive"
3131

3232
- name: Install latest Rust stable toolchain
33-
uses: actions-rs/toolchain@v1
33+
uses: dtolnay/rust-toolchain@stable
3434
with:
35-
toolchain: stable
36-
default: true
35+
targets: wasm32-wasi wasm32-unknown-unknown
3736
components: clippy, rustfmt
3837

3938
- name: Install latest Rust nightly toolchain
40-
uses: actions-rs/toolchain@v1
39+
uses: dtolnay/rust-toolchain@nightly
4140
with:
42-
toolchain: nightly
43-
default: false
41+
targets: wasm32-wasi wasm32-unknown-unknown
4442

4543
- name: Install Rust std source
4644
shell: bash
4745
run: rustup component add rust-src --toolchain nightly
4846

49-
- name: Install Wasm Rust targets
50-
shell: bash
51-
run: rustup target add wasm32-wasi wasm32-unknown-unknown
52-
5347
- uses: Swatinem/rust-cache@v2
5448
with:
5549
shared-key: "rust-cache-${{ hashFiles('./Cargo.lock') }}"
56-
cache-on-failure: "false"
50+
cache-on-failure: false
5751

5852
- name: Install WASI-SDK
5953
shell: bash
@@ -65,7 +59,7 @@ jobs:
6559
6660
- name: Cache CPython
6761
id: cache-cpython-wasi
68-
uses: actions/cache@v3
62+
uses: actions/cache@v4
6963
with:
7064
path: cpython/builddir/wasi
7165
key: cpython-wasi

0 commit comments

Comments
 (0)