Skip to content

Commit

Permalink
Merge pull request #181 from MarcoIeni/chore-ci-remove-deprecated-act…
Browse files Browse the repository at this point in the history
…ions-rs-actions

chore(ci): remove deprecated actions-rs actions
  • Loading branch information
Kobzol authored Nov 28, 2024
2 parents fced807 + 611dcd0 commit 469fc0c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 31 deletions.
30 changes: 7 additions & 23 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
## Based on https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md
name: Test

on:
Expand Down Expand Up @@ -30,15 +29,11 @@ jobs:
uses: actions/checkout@v4

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
profile: minimal
toolchain: 1.80.0
override: true
toolchain: 1.82.0
components: clippy, rustfmt

- uses: Swatinem/rust-cache@v2

- name: Install sqlx-cli
run: cargo install [email protected] --no-default-features --features native-tls,postgres

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

- name: Build
uses: actions-rs/cargo@v1
with:
command: build
args: --all --all-targets
run: cargo build --workspace --all-targets

- name: Test
uses: actions-rs/cargo@v1
with:
command: test
args: --all
run: cargo test --workspace

- name: Lint code
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all
run: cargo clippy --workspace

- name: Check formatting
uses: actions-rs/cargo@v1
with:
command: fmt
args: --all -- --check
run: cargo fmt --all --check

docker:
name: Test Docker
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.80 AS base
FROM rust:1.82 AS base

ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse

Expand Down
7 changes: 0 additions & 7 deletions src/tests/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ impl TestSyncMarker {
pub async fn sync(&self) {
self.get().sync().await;
}
pub fn hits(&self) -> usize {
self.get().hits()
}

fn get(&self) -> &TestSyncMarkerInner {
self.inner
Expand Down Expand Up @@ -57,8 +54,4 @@ impl TestSyncMarkerInner {
pub async fn sync(&self) {
self.rx.lock().await.recv().await.unwrap();
}

pub fn hits(&self) -> usize {
self.hits.load(Ordering::SeqCst)
}
}

0 comments on commit 469fc0c

Please sign in to comment.