Skip to content

Commit 469fc0c

Browse files
authored
Merge pull request #181 from MarcoIeni/chore-ci-remove-deprecated-actions-rs-actions
chore(ci): remove deprecated actions-rs actions
2 parents fced807 + 611dcd0 commit 469fc0c

File tree

3 files changed

+8
-31
lines changed

3 files changed

+8
-31
lines changed

.github/workflows/test.yml

+7-23
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
## Based on https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md
21
name: Test
32

43
on:
@@ -30,15 +29,11 @@ jobs:
3029
uses: actions/checkout@v4
3130

3231
- name: Install stable toolchain
33-
uses: actions-rs/toolchain@v1
32+
uses: actions-rust-lang/setup-rust-toolchain@v1
3433
with:
35-
profile: minimal
36-
toolchain: 1.80.0
37-
override: true
34+
toolchain: 1.82.0
3835
components: clippy, rustfmt
3936

40-
- uses: Swatinem/rust-cache@v2
41-
4237
- name: Install sqlx-cli
4338
run: cargo install [email protected] --no-default-features --features native-tls,postgres
4439

@@ -49,28 +44,17 @@ jobs:
4944
run: cargo sqlx prepare --check -- --tests
5045

5146
- name: Build
52-
uses: actions-rs/cargo@v1
53-
with:
54-
command: build
55-
args: --all --all-targets
47+
run: cargo build --workspace --all-targets
5648

5749
- name: Test
58-
uses: actions-rs/cargo@v1
59-
with:
60-
command: test
61-
args: --all
50+
run: cargo test --workspace
6251

6352
- name: Lint code
64-
uses: actions-rs/cargo@v1
65-
with:
66-
command: clippy
67-
args: --all
53+
run: cargo clippy --workspace
6854

6955
- name: Check formatting
70-
uses: actions-rs/cargo@v1
71-
with:
72-
command: fmt
73-
args: --all -- --check
56+
run: cargo fmt --all --check
57+
7458
docker:
7559
name: Test Docker
7660
runs-on: ubuntu-latest

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.80 AS base
1+
FROM rust:1.82 AS base
22

33
ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
44

src/tests/util.rs

-7
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ impl TestSyncMarker {
1919
pub async fn sync(&self) {
2020
self.get().sync().await;
2121
}
22-
pub fn hits(&self) -> usize {
23-
self.get().hits()
24-
}
2522

2623
fn get(&self) -> &TestSyncMarkerInner {
2724
self.inner
@@ -57,8 +54,4 @@ impl TestSyncMarkerInner {
5754
pub async fn sync(&self) {
5855
self.rx.lock().await.recv().await.unwrap();
5956
}
60-
61-
pub fn hits(&self) -> usize {
62-
self.hits.load(Ordering::SeqCst)
63-
}
6457
}

0 commit comments

Comments
 (0)