Skip to content

Commit 9acfecb

Browse files
authored
internal: fix typo in ci & switch rust-toolchain action (#566)
1 parent 02a740c commit 9acfecb

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

.github/workflows/rust.yml

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
uses: actions/checkout@v4
6969

7070
- name: Update apt repositories
71-
if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'arm-unknown-linux-gnueabihf'
71+
if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'aarch64-unknown-linux-gnu'
7272
run: sudo apt-get update
7373

7474
- name: Install AArch64 target toolchain
@@ -80,21 +80,25 @@ jobs:
8080
run: sudo apt-get install musl-tools
8181

8282
- name: Install Toolchain
83-
uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 # pin@oxide/master
83+
uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
8484
with:
85-
toolchain: stable
86-
target: ${{ matrix.target }}
87-
profile: minimal
88-
override: true
85+
toolchain: 1.88.0
86+
targets: ${{ matrix.target }}
8987

9088
- name: Cache
9189
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2
9290

9391
- name: Build
9492
run: RUSTFLAGS="${{ matrix.rustflags }}" cargo build --target ${{ matrix.target }} --release
93+
shell: bash
9594

96-
- name: Rename artifact
97-
run: mv target/${{ matrix.target }}/release/squawk* target/release/${{ matrix.artifact_name }}
95+
- name: Rename artifact (windows)
96+
if: matrix.target == 'x86_64-pc-windows-msvc'
97+
run: mv target/${{ matrix.target }}/release/squawk.exe target/release/${{ matrix.artifact_name }}
98+
99+
- name: Rename artifact (linux, mac)
100+
if: matrix.target != 'x86_64-pc-windows-msvc'
101+
run: mv target/${{ matrix.target }}/release/squawk target/release/${{ matrix.artifact_name }}
98102

99103
- name: Artifact
100104
uses: actions/upload-artifact@v4
@@ -231,17 +235,14 @@ jobs:
231235
uses: actions/checkout@v4
232236

233237
- name: Install Toolchain
234-
uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 # pin@oxide/master
238+
uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
239+
with:
240+
toolchain: 1.88.0
241+
components: clippy, rustfmt
235242

236243
- name: Cache
237244
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2
238245

239-
- name: Install Rust Fmt
240-
run: rustup component add rustfmt
241-
242-
- name: Install Clippy
243-
run: rustup component add clippy
244-
245246
- name: Get Clippy Version
246247
run: cargo clippy --version
247248

@@ -259,7 +260,9 @@ jobs:
259260
uses: actions/checkout@v4
260261

261262
- name: Install Toolchain
262-
uses: oxidecomputer/actions-rs_toolchain@ad3f86084a8a5acf2c09cb691421b31cf8af7a36 # pin@oxide/master
263+
uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
264+
with:
265+
toolchain: 1.88.0
263266

264267
- name: Cache
265268
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2

0 commit comments

Comments
 (0)