From 2e5fb1e2122444ccb2ebad4197a82700df4f100f Mon Sep 17 00:00:00 2001 From: continuist Date: Sat, 5 Jul 2025 02:35:10 -0400 Subject: [PATCH] Make sure postgres env variables for test stage are consistent --- .forgejo/workflows/ci.yml | 4 ++-- backend/crates/postgres/TEST_README.md | 6 +++--- docker-compose.test.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index e6ffda0..fad4dca 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: - name: Validate migration files env: - DATABASE_URL: postgres://postgres:postgres@localhost:5432/sharenet_test + DATABASE_URL: postgres://postgres:password@localhost:5432/sharenet_test run: | # Wait for PostgreSQL to be ready echo "Waiting for PostgreSQL to be ready..." @@ -95,7 +95,7 @@ jobs: - name: Run backend tests working-directory: ./backend env: - DATABASE_URL: postgres://postgres:postgres@localhost:5432/sharenet_test + DATABASE_URL: postgres://postgres:password@localhost:5432/sharenet_test run: | # Run tests with increased parallelism for Rust docker exec ci-dind docker exec ci-cd-test-rust cargo test --all --jobs 4 diff --git a/backend/crates/postgres/TEST_README.md b/backend/crates/postgres/TEST_README.md index a5cb155..dbc8e3e 100644 --- a/backend/crates/postgres/TEST_README.md +++ b/backend/crates/postgres/TEST_README.md @@ -23,13 +23,13 @@ CREATE DATABASE sharenet_test; Set the `DATABASE_URL` environment variable: ```bash -export DATABASE_URL="postgres://username:password@localhost:5432/sharenet_test" +export DATABASE_URL="postgres://postgres:password@localhost:5432/sharenet_test" ``` Or create a `.env` file in the postgres crate directory: ```env -DATABASE_URL=postgres://username:password@localhost:5432/sharenet_test +DATABASE_URL=postgres://postgres:password@localhost:5432/sharenet_test ``` ### 3. SQLx Setup @@ -199,7 +199,7 @@ Example GitHub Actions setup: - name: Run Postgres Tests env: - DATABASE_URL: postgres://postgres:postgres@localhost:5432/sharenet_test + DATABASE_URL: postgres://postgres:password@localhost:5432/sharenet_test run: | cd backend/crates/postgres cargo test diff --git a/docker-compose.test.yml b/docker-compose.test.yml index fdc1cc7..7500175 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -9,7 +9,7 @@ services: environment: POSTGRES_DB: sharenet_test POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres + POSTGRES_PASSWORD: password ports: - "5432:5432" healthcheck: