Skip to content

Commit 4f5744c

Browse files
Merge branch 'main' into dependabot/cargo/rmp-serde-1.3.1
2 parents 380470c + 9b2d8be commit 4f5744c

40 files changed

+443
-963
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DATABASE_URL=postgres://postgres:postgres@localhost:5432/event_store
1+
DATABASE_URL=postgres://postgres:postgres@localhost:5432/postgres

.github/workflows/ci.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
name: CI
22

3-
on:
3+
on:
44
push:
55
paths-ignore:
66
- 'docs/**'
7-
pull_request:
8-
paths-ignore:
9-
- 'docs/**'
107
env:
118
CARGO_TERM_COLOR: always
129
RUST_BACKTRACE: 1
@@ -20,8 +17,8 @@ jobs:
2017
image: postgres
2118
env:
2219
POSTGRES_USER: postgres
23-
POSTGRES_PASSWORD: postgres
24-
POSTGRES_DB: event_store
20+
POSTGRES_PASSWORD: postgres
21+
POSTGRES_DB: event_store
2522
ports:
2623
- 5432:5432
2724
options: >-
@@ -42,11 +39,7 @@ jobs:
4239
target
4340
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
4441
- name: Install stable toolchain
45-
uses: actions-rs/toolchain@v1
46-
with:
47-
profile: minimal
48-
toolchain: stable
49-
override: true
42+
uses: dtolnay/rust-toolchain@stable
5043
- name: Install Protoc
5144
uses: 4w3official/setup-protoc-action@v1
5245
- name: Run cargo test
@@ -56,8 +49,13 @@ jobs:
5649
name: Rustfmt
5750
runs-on: ubuntu-latest
5851
steps:
59-
- uses: actions/checkout@v3
60-
- name: Run cargo fmt
52+
- name: Checkout repository
53+
uses: actions/checkout@v3
54+
- name: Install stable toolchain
55+
uses: dtolnay/rust-toolchain@stable
56+
with:
57+
components: rustfmt
58+
- name: Run cargo fmt
6159
run: cargo fmt --all -- --check
6260

6361
clippy:
@@ -66,6 +64,10 @@ jobs:
6664
steps:
6765
- name: Checkout repository
6866
uses: actions/checkout@v3
67+
- name: Install stable toolchain
68+
uses: dtolnay/rust-toolchain@stable
69+
with:
70+
components: clippy
6971
- name: Install Protoc
7072
uses: 4w3official/setup-protoc-action@v1
7173
- name: Run clippy

0 commit comments

Comments
 (0)