ci: set the correct variable for testing with postgres

build-trust · Jan 10, 2025 · 0c4d9cb · 0c4d9cb
1 parent 6902370
commit 0c4d9cb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -213,11 +213,7 @@ jobs:
       - name: Run postgres test on ${{ matrix.test_projects }}
         run: |
           pg_ctl -D /var/lib/postgresql/data -l logfile start
-          export OCKAM_POSTGRES_HOST=localhost
-          export OCKAM_POSTGRES_PORT=5432
-          export OCKAM_POSTGRES_DATABASE_NAME=test
-          export OCKAM_POSTGRES_USER=postgres
-          export OCKAM_POSTGRES_PASSWORD=password
+          export OCKAM_DATABASE_CONNECTION_URL=postgres://postgres:password@localhost:5432/test
           make -f implementations/rust/Makefile test_postgres
 
       - name: Nix Upload Store

diff --git a/implementations/rust/Makefile b/implementations/rust/Makefile
@@ -49,11 +49,7 @@ nextest_%:
 	cargo --locked nextest --config-file $(ROOT_DIR)/tools/nextest/.config/nextest.toml run -E 'package($*)' --no-fail-fast
 	cargo --locked test --doc
 test_postgres:
-	export OCKAM_POSTGRES_HOST=localhost
-	export OCKAM_POSTGRES_PORT=5433
-	export OCKAM_POSTGRES_DATABASE_NAME=test
-	export OCKAM_POSTGRES_USER=postgres
-	export OCKAM_POSTGRES_PASSWORD=password
+	export OCKAM_DATABASE_CONNECTION_URL=postgres://postgres:password@localhost:5433/test
 	cargo --locked nextest --config-file $(ROOT_DIR)/tools/nextest/.config/nextest.toml run -E 'test(sql) or test(cli_state)' --no-fail-fast --test-threads 1
 
 lint: lint_cargo_fmt_check lint_cargo_deny lint_cargo_clippy