From 8605c8faead0c07700179472d338ae7cb72416a0 Mon Sep 17 00:00:00 2001 From: etorreborre Date: Fri, 10 Jan 2025 11:51:51 +0100 Subject: [PATCH] ci: set the correct variable for testing with postgres --- .github/workflows/rust.yml | 6 +----- implementations/rust/Makefile | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index e9b8b56b1f8..6a38ef1e040 100644 --- 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 index d7ebf49dbc3..8d689d5ef9f 100644 --- 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