Merge branch 'main' into monorepo-workflows

wisemen-digital · Nov 1, 2024 · c18992b · c18992b
2 parents 739cc5f + 00b10b8
commit c18992b
Show file tree

Hide file tree

Showing 3 changed files with 680 additions and 12 deletions.
diff --git a/.github/workflows/node-build-and-test.yml b/.github/workflows/node-build-and-test.yml
@@ -29,6 +29,10 @@ on:
         description: Image to use for PostgreSQL test DB (defaults to normal image)
         default: 'postgis/postgis'
         type: string
+      test-postgres-db:
+        description: Name to use for PostgreSQL test DB (defaults to test_db)
+        default: 'test_db'
+        type: string
       test-redis-enabled:
         description: Enable Redis test service (defaults to false)
         default: false
@@ -144,7 +148,7 @@ jobs:
         ports:
           - 5432:5432
         env:
-          POSTGRES_DB: 'test_db'
+          POSTGRES_DB: ${{ inputs.test-postgres-db }}
           POSTGRES_USER: 'postgres'
           POSTGRES_PASSWORD: 'password'
           POSTGRES_HOST_AUTH_METHOD: trust
@@ -167,7 +171,7 @@ jobs:
         options: >-
           --health-cmd "${{ needs.prep-test.outputs.typesense-health }}"
           --health-interval 10s
-          --health-timeout 5s
+          --health-timeout 10s
           --health-retries 5
     steps:
       - name: Checkout