Skip to content

Commit 88bb1dc

Browse files
authored
Maintenance (#228)
* clippy * updates * bump actions * remove deprecated actions-rs actions
1 parent 3064820 commit 88bb1dc

File tree

4 files changed

+55
-87
lines changed

4 files changed

+55
-87
lines changed

.github/workflows/ci.yml

+14-46
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,22 @@ jobs:
2929
SQLX_FEATURES: postgres
3030
steps:
3131
- name: Checkout repository
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333

3434
- name: Cache dependencies
3535
id: cache-dependencies
36-
uses: actions/cache@v3
36+
uses: actions/cache@v4
3737
with:
3838
path: |
3939
~/.cargo/registry
4040
~/.cargo/git
4141
target
4242
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
4343

44-
- name: Install stable toolchain
45-
uses: actions-rs/toolchain@v1
46-
with:
47-
profile: minimal
48-
toolchain: stable
49-
override: true
44+
- uses: dtolnay/rust-toolchain@stable
5045

5146
- name: Cache sqlx-cli
52-
uses: actions/cache@v3
47+
uses: actions/cache@v4
5348
id: cache-sqlx
5449
with:
5550
path: |
@@ -58,16 +53,8 @@ jobs:
5853
key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }}-${{ env.SQLX_FEATURES }}
5954

6055
- name: Install sqlx-cli
61-
uses: actions-rs/cargo@v1
6256
if: steps.cache-sqlx.outputs.cache-hit == false
63-
with:
64-
command: install
65-
args: >
66-
sqlx-cli
67-
--force
68-
--version=${{ env.SQLX_VERSION }}
69-
--features=${{ env.SQLX_FEATURES }}
70-
--locked
57+
run: cargo install sqlx-cli --force --version=${{ env.SQLX_VERSION }} --features=${{ env.SQLX_FEATURES }} --locked
7158

7259
- name: Migrate database
7360
run: |
@@ -84,16 +71,10 @@ jobs:
8471
name: Rust format
8572
runs-on: ubuntu-latest
8673
steps:
87-
- uses: actions/checkout@v3
88-
- uses: actions-rs/toolchain@v1
89-
with:
90-
toolchain: stable
91-
override: true
92-
components: rustfmt
93-
- uses: actions-rs/cargo@v1
94-
with:
95-
command: fmt
96-
args: --all -- --check
74+
- uses: actions/checkout@v4
75+
- uses: dtolnay/rust-toolchain@stable
76+
- name: run cargo fmt
77+
run: cargo fmt --all -- --check
9778

9879
rust-clippy:
9980
name: Clippy
@@ -112,34 +93,21 @@ jobs:
11293
SQLX_FEATURES: postgres
11394
steps:
11495
- name: Checkout repository
115-
uses: actions/checkout@v3
96+
uses: actions/checkout@v4
11697

117-
- name: Install stable toolchain
118-
uses: actions-rs/toolchain@v1
119-
with:
120-
toolchain: stable
121-
components: clippy
122-
override: true
98+
- uses: dtolnay/rust-toolchain@stable
12399

124100
- name: Cache sqlx-cli
125-
uses: actions/cache@v3
101+
uses: actions/cache@v4
126102
id: cache-sqlx
127103
with:
128104
path: |
129105
~/.cargo/bin/sqlx
130106
key: ${{ runner.os }}-sqlx-${{ env.SQLX_VERSION }}-${{ env.SQLX_FEATURES }}
131107

132108
- name: Install sqlx-cli
133-
uses: actions-rs/cargo@v1
134109
if: steps.cache-sqlx.outputs.cache-hit == false
135-
with:
136-
command: install
137-
args: >
138-
sqlx-cli
139-
--force
140-
--version=${{ env.SQLX_VERSION }}
141-
--features=${{ env.SQLX_FEATURES }}
142-
--locked
110+
run: cargo install sqlx-cli --force --version=${{ env.SQLX_VERSION }} --features=${{ env.SQLX_FEATURES }} --locked
143111

144112
- name: Migrate database
145113
run: |
@@ -156,7 +124,7 @@ jobs:
156124
runs-on: ubuntu-latest
157125
steps:
158126
- name: Checkout repository
159-
uses: actions/checkout@v3
127+
uses: actions/checkout@v4
160128

161129
- name: build
162130
run: |

0 commit comments

Comments
 (0)