Skip to content

Commit b8ef5d1

Browse files
authored
Merge pull request #931 from rust-lang/ci-deprecations
Remove deprecated actions-rs usage
2 parents 161a644 + 83c03be commit b8ef5d1

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -168,11 +168,8 @@ jobs:
168168
with:
169169
ref: "${{ github.event.pull_request.head.sha }}"
170170
- name: Install Rust
171-
uses: actions-rs/toolchain@v1
171+
uses: dtolnay/rust-toolchain@stable
172172
with:
173-
profile: minimal
174-
toolchain: stable
175-
override: true
176173
components: rustfmt
177174
- name: Cache Cargo intermediate products
178175
uses: actions/cache@v3
@@ -183,15 +180,9 @@ jobs:
183180
ui/target
184181
key: "${{ runner.os }}-cargo-${{ hashFiles('ui/**/Cargo.lock') }}-2"
185182
- name: Format server
186-
uses: actions-rs/cargo@v1
187-
with:
188-
command: fmt
189-
args: "--manifest-path ui/Cargo.toml --all --check"
183+
run: cargo fmt --manifest-path ui/Cargo.toml --all --check
190184
- name: Format top-crates
191-
uses: actions-rs/cargo@v1
192-
with:
193-
command: fmt
194-
args: "--manifest-path top-crates/Cargo.toml --check"
185+
run: cargo fmt --manifest-path top-crates/Cargo.toml --check
195186
- name: Build backend
196187
run: |-
197188
mkdir -p ui/target; docker run --rm -v $PWD/ui:/ui -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry --workdir /ui rust:alpine sh -c '

ci/workflows.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,8 @@ workflows:
263263
- *checkout_pr
264264

265265
- name: "Install Rust"
266-
uses: actions-rs/toolchain@v1
266+
uses: dtolnay/rust-toolchain@stable
267267
with:
268-
profile: minimal
269-
toolchain: stable
270-
override: true
271268
components: rustfmt
272269

273270
- name: "Cache Cargo intermediate products"
@@ -280,16 +277,10 @@ workflows:
280277
key: ${{ runner.os }}-cargo-${{ hashFiles('ui/**/Cargo.lock') }}-2
281278

282279
- name: "Format server"
283-
uses: actions-rs/cargo@v1
284-
with:
285-
command: fmt
286-
args: --manifest-path ui/Cargo.toml --all --check
280+
run: cargo fmt --manifest-path ui/Cargo.toml --all --check
287281

288282
- name: "Format top-crates"
289-
uses: actions-rs/cargo@v1
290-
with:
291-
command: fmt
292-
args: --manifest-path top-crates/Cargo.toml --check
283+
run: cargo fmt --manifest-path top-crates/Cargo.toml --check
293284

294285
- name: "Build backend"
295286
run: >-

0 commit comments

Comments
 (0)