Compare commits
4
Commits
main
...
784b881797
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
784b881797 | ||
|
|
c358b5b9b7 | ||
|
|
8cb3abd071 | ||
|
|
6d52be230f |
@@ -16,8 +16,6 @@ jobs:
|
|||||||
POSTGRES_PASSWORD: postgres
|
POSTGRES_PASSWORD: postgres
|
||||||
POSTGRES_USER: postgres
|
POSTGRES_USER: postgres
|
||||||
POSTGRES_DB: bknd
|
POSTGRES_DB: bknd
|
||||||
ports:
|
|
||||||
- 5430:5432
|
|
||||||
options: >-
|
options: >-
|
||||||
--health-cmd pg_isready
|
--health-cmd pg_isready
|
||||||
--health-interval 10s
|
--health-interval 10s
|
||||||
|
|||||||
@@ -8,9 +8,12 @@ import { $ } from "bun";
|
|||||||
import { connectionTestSuite } from "data/connection/connection-test-suite";
|
import { connectionTestSuite } from "data/connection/connection-test-suite";
|
||||||
import { bunTestRunner } from "adapter/bun/test";
|
import { bunTestRunner } from "adapter/bun/test";
|
||||||
|
|
||||||
|
const isCI = !!(process.env.GITEA_ACTIONS || process.env.GITHUB_ACTIONS);
|
||||||
|
|
||||||
const credentials = {
|
const credentials = {
|
||||||
host: "localhost",
|
// Changes to "postgres" inside CI to talk directly to the Gitea service container
|
||||||
port: 5430,
|
host: isCI ? "postgres" : "localhost",
|
||||||
|
port: 5432,
|
||||||
user: "postgres",
|
user: "postgres",
|
||||||
password: "postgres",
|
password: "postgres",
|
||||||
database: "bknd",
|
database: "bknd",
|
||||||
@@ -39,6 +42,11 @@ async function isPostgresRunning() {
|
|||||||
|
|
||||||
describe("postgres", () => {
|
describe("postgres", () => {
|
||||||
beforeAll(async () => {
|
beforeAll(async () => {
|
||||||
|
if (process.env.GITEA_ACTIONS || process.env.GITHUB_ACTIONS) {
|
||||||
|
console.log("Running in CI: Skipping manual docker run");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (!(await isPostgresRunning())) {
|
if (!(await isPostgresRunning())) {
|
||||||
await $`docker run --rm --name bknd-test-postgres -d -e POSTGRES_PASSWORD=${credentials.password} -e POSTGRES_USER=${credentials.user} -e POSTGRES_DB=${credentials.database} -p ${credentials.port}:5432 postgres:17`;
|
await $`docker run --rm --name bknd-test-postgres -d -e POSTGRES_PASSWORD=${credentials.password} -e POSTGRES_USER=${credentials.user} -e POSTGRES_DB=${credentials.database} -p ${credentials.port}:5432 postgres:17`;
|
||||||
await $waitUntil("Postgres is running", isPostgresRunning, 500, 20);
|
await $waitUntil("Postgres is running", isPostgresRunning, 500, 20);
|
||||||
|
|||||||
Reference in New Issue
Block a user