wip

mettle · Apr 19, 2024 · cab1b34 · cab1b34
1 parent c172543
commit cab1b34
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,6 +9,10 @@ jobs:
           "kirschbaumdevelopment/laravel-test-runner:8.2",
           "kirschbaumdevelopment/laravel-test-runner:8.3"
         ]
+        db_connection: [
+          "mysql",
+          "pgsql"
+        ]
 
     container:
       image: ${{ matrix.container }}
@@ -20,19 +24,19 @@ jobs:
         image: mysql:5.7
         env:
           MYSQL_ROOT_PASSWORD: password
-          MYSQL_USER: homestead
+          MYSQL_DATABASE: sendportal_testing
+          MYSQL_USER: laravel
           MYSQL_PASSWORD: secret
-          MYSQL_DATABASE: sendportal_dev
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
       postgres:
         image: postgres
         env:
-          POSTGRES_USER: homestead
+          POSTGRES_DB: sendportal_testing
+          POSTGRES_USER: laravel
           POSTGRES_PASSWORD: secret
-          POSTGRES_DB: sendportal_dev
         ports:
           - 5432:5432
         options: --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -44,12 +48,4 @@ jobs:
       - name: Run Testsuite against MySQL
         run: vendor/bin/phpunit
         env:
-          DB_CONNECTION: mysql
-          DB_HOST: mysql
-          DB_PORT: 3306
-      - name: Run Testsuite against Postgres
-        run: vendor/bin/phpunit
-        env:
-          DB_CONNECTION: pgsql
-          DB_HOST: postgres
-          DB_PORT: 5432
+          DB_CONNECTION: ${{ matrix.db_connection }}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -20,8 +20,8 @@
         <env name="CACHE_DRIVER" value="array"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="DB_DATABASE" value="sendportal-testing"/>
-        <env name="DB_USERNAME" value="root"/>
+        <env name="DB_DATABASE" value="sendportal_testing"/>
+        <env name="DB_USERNAME" value="laravel"/>
         <env name="DB_PASSWORD" value="secret"/>
     </php>
 </phpunit>