Skip to content

Commit edcadf8

Browse files
committed
Migrate the CI to dtolnay/rust-toolchain instead of unmaintained action-rs/toolchain
1 parent f79c290 commit edcadf8

File tree

1 file changed

+6
-22
lines changed

1 file changed

+6
-22
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -106,33 +106,23 @@ jobs:
106106
echo "DATABASE_URL=mysql://root@localhost/diesel_test" >> $GITHUB_ENV
107107
108108
- name: Install rust toolchain
109-
uses: actions-rs/toolchain@v1
109+
uses: dtolnay/rust-toolchain@master
110110
with:
111-
profile: minimal
112111
toolchain: ${{ matrix.rust }}
113-
override: true
114112
- name: Rust version check
115-
uses: actions-rs/cargo@v1
116-
with:
117-
command: version
113+
run: cargo +${{ matrix.rust }} version
118114

119115
- name: Test diesel_async
120-
uses: actions-rs/cargo@v1
121-
with:
122-
command: test
123-
args: --manifest-path Cargo.toml --no-default-features --features "${{ matrix.backend }}"
116+
run: cargo +{{ matrix.rust }} test --manifest-path Cargo.toml --no-default-features --features "${{ matrix.backend }} deadpool bb8 mobc"
124117

125118
rustfmt_and_clippy:
126119
name: Check rustfmt style && run clippy
127120
runs-on: ubuntu-latest
128121
steps:
129122
- uses: actions/checkout@v2
130-
- uses: actions-rs/toolchain@v1
123+
- uses: dtolnay/rust-toolchain@stable
131124
with:
132-
toolchain: stable
133-
profile: minimal
134125
components: clippy, rustfmt
135-
override: true
136126
- name: Cache cargo registry
137127
uses: actions/cache@v2
138128
with:
@@ -148,13 +138,7 @@ jobs:
148138
find ~/.cargo/registry -iname "*clippy.toml" -delete
149139
150140
- name: Run clippy
151-
uses: actions-rs/cargo@v1
152-
with:
153-
command: clippy
154-
args: --all
141+
run: cargo +stable clippy --all
155142

156143
- name: Check formating
157-
uses: actions-rs/cargo@v1
158-
with:
159-
command: fmt
160-
args: --all -- --check
144+
run: cargo +stable fmt --all -- --check

0 commit comments

Comments
 (0)