Skip to content

Commit 4c20698

Browse files
committed
fix CI/Cargo issues
1 parent 48bbc51 commit 4c20698

File tree

3 files changed

+91
-95
lines changed

3 files changed

+91
-95
lines changed

.github/workflows/ci.yml

+10-13
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@ jobs:
1515
name: Build
1616
steps:
1717
- uses: actions/checkout@v3
18-
18+
1919
- uses: Swatinem/rust-cache@v2
20-
with:
20+
with:
2121
shared-key: ci-build
22-
23-
- name: Check that lockfile is up to date
24-
run: cargo update #--locked
22+
2523
- name: Check code builds without warnings
26-
run: cargo check --verbose --workspace
24+
run: cargo clippy --locked --verbose --workspace
2725

2826
lint:
2927
runs-on: ubuntu-latest
@@ -33,7 +31,7 @@ jobs:
3331
steps:
3432
- uses: actions/checkout@v3
3533
- uses: Swatinem/rust-cache@v2
36-
with:
34+
with:
3735
shared-key: ci-build
3836
save-if: false
3937
- name: Run clippy
@@ -49,20 +47,19 @@ jobs:
4947
steps:
5048
- uses: actions/checkout@v3
5149
- uses: Swatinem/rust-cache@v2
52-
with:
50+
with:
5351
shared-key: ci-build
5452
save-if: false
5553
- name: Run Cargo tests
5654
run: cargo test --verbose
57-
58-
55+
5956
docker_publish:
6057
runs-on: ubuntu-latest
6158
name: Publish built container
6259
needs:
6360
- lint
6461
- test
65-
62+
6663
if: success() && github.ref_name == 'main' && github.event_name == 'push'
6764
steps:
6865
- uses: actions/checkout@v3
@@ -72,7 +69,7 @@ jobs:
7269
filters: |
7370
server:
7471
- 'dcspkg_server/**'
75-
72+
7673
- name: Build and publish a Docker image for dcspkg server
7774
if: steps.has_server_changed.outputs.server == 'true'
7875
uses: macbre/push-to-ghcr@v12
@@ -90,7 +87,7 @@ jobs:
9087
steps:
9188
- uses: actions/checkout@v3
9289
- uses: Swatinem/rust-cache@v2
93-
with:
90+
with:
9491
shared-key: ci-build
9592
save-if: false
9693
- uses: katyo/publish-crates@v1

0 commit comments

Comments
 (0)