Skip to content
This repository was archived by the owner on Dec 26, 2024. It is now read-only.

Commit 3d25d46

Browse files
authored
ci: replace non-maintained actions-rs/toolchain with dtolnay/rust-toolchain (#1289)
1 parent 1e5c93c commit 3d25d46

File tree

3 files changed

+16
-36
lines changed

3 files changed

+16
-36
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ jobs:
3939
os: [macos-latest, ubuntu-latest]
4040
steps:
4141
- uses: actions/checkout@v3
42-
- uses: actions-rs/toolchain@v1
43-
with:
44-
toolchain: stable
42+
- uses: dtolnay/rust-toolchain@stable
4543
- uses: Swatinem/rust-cache@v2
4644

4745
- run: mkdir data
@@ -61,9 +59,7 @@ jobs:
6159
os: [macos-latest, ubuntu-latest]
6260
steps:
6361
- uses: actions/checkout@v3
64-
- uses: actions-rs/toolchain@v1
65-
with:
66-
toolchain: stable
62+
- uses: dtolnay/rust-toolchain@stable
6763
- uses: Swatinem/rust-cache@v2
6864
- run: npm install -g [email protected]
6965
- run: |
@@ -78,9 +74,7 @@ jobs:
7874
os: [macos-latest, ubuntu-latest]
7975
steps:
8076
- uses: actions/checkout@v3
81-
- uses: actions-rs/toolchain@v1
82-
with:
83-
toolchain: stable
77+
- uses: dtolnay/rust-toolchain@stable
8478
- uses: Swatinem/rust-cache@v2
8579
- run: cargo build -r -p papyrus_load_test
8680

@@ -91,9 +85,7 @@ jobs:
9185
os: [macos-latest, ubuntu-latest]
9286
steps:
9387
- uses: actions/checkout@v3
94-
- uses: actions-rs/toolchain@v1
95-
with:
96-
toolchain: stable
88+
- uses: dtolnay/rust-toolchain@stable
9789
- uses: Swatinem/rust-cache@v2
9890
- run: >
9991
cargo test -r --test '*' -- --include-ignored --skip test_gw_integration_testnet;
@@ -103,12 +95,12 @@ jobs:
10395
runs-on: ubuntu-latest
10496
steps:
10597
- uses: actions/checkout@v3
106-
- uses: actions-rs/toolchain@v1
98+
- uses: dtolnay/rust-toolchain@master
10799
with:
108100
components: rustfmt
109-
toolchain: nightly-2023-07-05
101+
toolchain: nightly-2023-10-19
110102
- uses: Swatinem/rust-cache@v2
111-
- run: cargo +nightly-2023-07-05 fmt --all -- --check
103+
- run: cargo +nightly-2023-10-19 fmt --all -- --check
112104

113105
udeps:
114106
runs-on: ubuntu-latest
@@ -117,23 +109,22 @@ jobs:
117109
- uses: dtolnay/rust-toolchain@master
118110
name: "Rust Toolchain Setup"
119111
with:
120-
toolchain: nightly-2023-07-05
112+
toolchain: nightly-2023-10-19
121113
- uses: Swatinem/rust-cache@v2
122114
- name: "Download and run cargo-udeps"
123115
run: |
124116
wget -O - -c https://github.com/est31/cargo-udeps/releases/download/v0.1.35/cargo-udeps-v0.1.35-x86_64-unknown-linux-gnu.tar.gz | tar -xz
125117
cargo-udeps-*/cargo-udeps udeps
126118
env:
127-
RUSTUP_TOOLCHAIN: nightly-2023-07-05
119+
RUSTUP_TOOLCHAIN: nightly-2023-10-19
128120

129121
clippy:
130122
runs-on: ubuntu-latest
131123
steps:
132124
- uses: actions/checkout@v3
133-
- uses: actions-rs/toolchain@v1
125+
- uses: dtolnay/rust-toolchain@stable
134126
with:
135127
components: clippy
136-
toolchain: stable
137128
- uses: Swatinem/rust-cache@v2
138129
- run: >
139130
cargo clippy --all-targets --all-features -- -D warnings -D future-incompatible
@@ -145,9 +136,7 @@ jobs:
145136
RUSTDOCFLAGS: "-D warnings"
146137
steps:
147138
- uses: actions/checkout@v3
148-
- uses: actions-rs/toolchain@v1
149-
with:
150-
toolchain: stable
139+
- uses: dtolnay/rust-toolchain@stable
151140
- uses: Swatinem/rust-cache@v2
152141
- run: cargo doc -r --document-private-items --no-deps
153142

@@ -157,20 +146,15 @@ jobs:
157146
RUSTDOCFLAGS: "-D warnings"
158147
steps:
159148
- uses: actions/checkout@v3
160-
- uses: actions-rs/toolchain@v1
161-
with:
162-
toolchain: stable
149+
- uses: dtolnay/rust-toolchain@stable
163150
- uses: Swatinem/rust-cache@v2
164151
- run: cargo check -r --all-features
165152

166153
codecov:
167154
runs-on: ubuntu-latest
168155
steps:
169156
- uses: actions/checkout@v3
170-
- uses: actions-rs/toolchain@v1
171-
with:
172-
toolchain: stable
173-
override: true
157+
- uses: dtolnay/rust-toolchain@stable
174158
- name: Set-Up
175159
run: |
176160
sudo apt-get update
@@ -195,7 +179,5 @@ jobs:
195179
if: github.base_ref == 'main' # this step is only run if the pr is to the main branch
196180
steps:
197181
- uses: actions/checkout@v3
198-
with:
199-
toolchain: stable
200182
- run: sudo apt-get install jq
201183
- run: ./check_starknet_api_version_dependency.sh # this script checks that if the starknet_api dependency is by git rev then this rev (commit) is on main

.github/workflows/nightly-tests-call.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ jobs:
2121
runs-on: ${{ inputs.os }}
2222
steps:
2323
- uses: actions/checkout@v3
24-
- uses: actions-rs/toolchain@v1
25-
with:
26-
toolchain: stable
24+
- uses: dtolnay/rust-toolchain@stable
2725
- uses: Swatinem/rust-cache@v2
2826
- run: sudo apt update; sudo apt -y install libclang-dev
2927
# Install libclang-dev that is not a part of the ubuntu vm in github actions.

rustfmt.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ wrap_comments = true
2424
# "rust-analyzer.rustfmt.overrideCommand": [
2525
# "rustup",
2626
# "run",
27-
# "nightly-2023-07-05",
27+
# "nightly-2023-10-19",
2828
# "--",
2929
# "rustfmt",
3030
# "--edition",
3131
# "2018",
3232
# "--"
3333
# ]
34-
# and run "rustup toolchain install nightly-2023-07-05".
34+
# and run "rustup toolchain install nightly-2023-10-19".

0 commit comments

Comments
 (0)