Skip to content

Commit e7e26d6

Browse files
committed
ci: run ci check on all main OSes
1 parent c6efd21 commit e7e26d6

File tree

2 files changed

+45
-11
lines changed
  • .github/workflows
  • test-context/src/ctx/migration/snapshot

2 files changed

+45
-11
lines changed

.github/workflows/ci.yaml

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,50 @@ env:
1818

1919
jobs:
2020

21+
check:
22+
name: Check
23+
runs-on: ${{ matrix.os }}
24+
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
os:
29+
- windows-2025
30+
- ubuntu-24.04
31+
- macos-15
32+
include:
33+
- os: windows-2022
34+
install: |
35+
git config --system core.longpaths true
36+
echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
37+
vcpkg install openssl:x64-windows-static-md
38+
39+
steps:
40+
- uses: actions/checkout@v5
41+
- uses: Swatinem/rust-cache@v2
42+
43+
- name: Cache Theseus Postgresql Installation
44+
uses: actions/cache@v4
45+
with:
46+
path: ~/.theseus/postgresql
47+
key: ${{ runner.os }}-theseus-postgresql-${{ hashFiles('**/Cargo.lock') }}
48+
49+
- name: Install dependencies
50+
if: matrix.install != ''
51+
run: ${{ matrix.install }}
52+
53+
- name: Check
54+
env:
55+
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # for embedded postgresql
56+
run: cargo check
57+
- name: Clippy
58+
env:
59+
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # for embedded postgresql
60+
run: cargo clippy --all-targets --all-features -- -D warnings -D clippy::unwrap_used -D clippy::expect_used
61+
2162
ci:
63+
needs:
64+
- check
2265
runs-on: ubuntu-24.04
2366

2467
steps:
@@ -50,7 +93,7 @@ jobs:
5093
sudo rm -Rf ${GRADLE_HOME}
5194
- run: df -h
5295

53-
- uses: actions/checkout@v4
96+
- uses: actions/checkout@v5
5497
- uses: Swatinem/rust-cache@v2
5598

5699
- name: Cache Theseus Postgresql Installation
@@ -62,16 +105,6 @@ jobs:
62105
- name: Format
63106
run: cargo fmt --check
64107

65-
- name: Check
66-
env:
67-
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # for embedded postgresql
68-
run: cargo check
69-
70-
- name: Clippy
71-
env:
72-
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" # for embedded postgresql
73-
run: cargo clippy --all-targets --all-features -- -D warnings -D clippy::unwrap_used -D clippy::expect_used
74-
75108
- name: Start minio
76109
run: |
77110
docker compose -f etc/deploy/compose/compose-minio.yaml up -d --wait

test-context/src/ctx/migration/snapshot/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ impl Snapshot {
3333

3434
Ok(TrustifyTestContext::new(
3535
db,
36+
psql.settings().port,
3637
storage,
3738
defer(psql).then(defer(tmp)),
3839
))

0 commit comments

Comments
 (0)