Skip to content

Commit 506230e

Browse files
committed
Combine GitHub database check jobs
This should be fairly safe to do. Although the side-effects of each step will be visible to subsequent steps, for the checks we're running, it's unlikely to matter. Saves a little build time.
1 parent e3efcf5 commit 506230e

File tree

1 file changed

+5
-17
lines changed

1 file changed

+5
-17
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ jobs:
131131
- name: Check benchmarks
132132
run: sh -x -c "ci/check-profiling.sh"
133133

134-
database-check-postgres:
135-
name: Database Check (postgres)
134+
database-check:
135+
name: Database Check
136136
runs-on: ubuntu-latest
137137
services:
138138
postgres:
@@ -156,27 +156,15 @@ jobs:
156156
with:
157157
toolchain: stable
158158

159+
- name: Build site
160+
run: cargo build --bin site
161+
159162
- name: Connect to PostgreSQL
160163
run: |
161-
cargo build --bin site
162164
timeout 5s ./target/debug/site 'postgresql://postgres:postgres@localhost:5432/postgres' 2>&1 | tee -a log || true
163165
grep -Fxq "Loading complete but no data identified; exiting." log
164166
165-
database-check-sqlite:
166-
name: Database Check (sqlite)
167-
runs-on: ubuntu-latest
168-
169-
steps:
170-
- name: Check out repository code
171-
uses: actions/checkout@v2
172-
173-
- name: Install stable
174-
uses: actions-rs/toolchain@v1
175-
with:
176-
toolchain: stable
177-
178167
- name: Connect to SQLite
179168
run: |
180-
cargo build --bin site
181169
timeout 5s ./target/debug/site 2>&1 | tee -a log || true
182170
grep -Fxq "Loading complete but no data identified; exiting." log

0 commit comments

Comments
 (0)