Merge pull request #68 from blocknotes/ci/improve-github-workflows

blocknotes · web-flow · commit e808b7b4f322 · 2025-04-10T00:01:34.000+02:00
Improve GitHub workflows
diff --git a/.github/workflows/specs_mssql_rails61.yml b/.github/workflows/specs_mssql_rails61.yml
@@ -17,9 +17,6 @@ jobs:
 
     env:
       DB_TEST: mssql
-      MSSQL_DB_HOST: 127.0.0.1
-      MSSQL_DB_USERNAME: sa
-      MSSQL_DB_PASSWORD: Pa%%w0rd
       RAILS_VERSION: 6.1
 
     services:
diff --git a/.github/workflows/specs_mssql_rails72.yml b/.github/workflows/specs_mssql_rails72.yml
@@ -17,9 +17,6 @@ jobs:
 
     env:
       DB_TEST: mssql
-      MSSQL_DB_HOST: 127.0.0.1
-      MSSQL_DB_USERNAME: sa
-      MSSQL_DB_PASSWORD: Pa%%w0rd
       RAILS_VERSION: 7.2
 
     services:
diff --git a/.github/workflows/specs_mssql_rails80.yml b/.github/workflows/specs_mssql_rails80.yml
@@ -17,9 +17,6 @@ jobs:
 
     env:
       DB_TEST: mssql
-      MSSQL_DB_HOST: 127.0.0.1
-      MSSQL_DB_USERNAME: sa
-      MSSQL_DB_PASSWORD: Pa%%w0rd
       RAILS_VERSION: 8.0
 
     services:
diff --git a/.github/workflows/specs_mysql_rails61.yml b/.github/workflows/specs_mysql_rails61.yml
@@ -17,9 +17,6 @@ jobs:
 
     env:
       DB_TEST: mysql
-      MYSQL_DB_HOST: 127.0.0.1
-      MYSQL_DB_USERNAME: root
-      MYSQL_DB_PASSWORD: root
       RAILS_VERSION: 6.1
 
     services:
diff --git a/.github/workflows/specs_mysql_rails72.yml b/.github/workflows/specs_mysql_rails72.yml
@@ -17,9 +17,6 @@ jobs:
 
     env:
       DB_TEST: mysql
-      MYSQL_DB_HOST: 127.0.0.1
-      MYSQL_DB_USERNAME: root
-      MYSQL_DB_PASSWORD: root
       RAILS_VERSION: 7.2
 
     services:
diff --git a/.github/workflows/specs_mysql_rails80.yml b/.github/workflows/specs_mysql_rails80.yml
@@ -17,9 +17,6 @@ jobs:
 
     env:
       DB_TEST: mysql
-      MYSQL_DB_HOST: 127.0.0.1
-      MYSQL_DB_USERNAME: root
-      MYSQL_DB_PASSWORD: root
       RAILS_VERSION: 8.0
 
     services:
diff --git a/.github/workflows/specs_postgres_rails61.yml b/.github/workflows/specs_postgres_rails61.yml
@@ -17,17 +17,14 @@ jobs:
 
     env:
       DB_TEST: postgres
-      PG_DB_HOST: 127.0.0.1
-      PG_DB_USERNAME: postgres
-      PG_DB_PASSWORD: postgres
       RAILS_VERSION: 6.1
 
     services:
       postgres:
         image: postgres:latest
         env:
           POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: password
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
diff --git a/.github/workflows/specs_postgres_rails72.yml b/.github/workflows/specs_postgres_rails72.yml
@@ -17,17 +17,14 @@ jobs:
 
     env:
       DB_TEST: postgres
-      PG_DB_HOST: 127.0.0.1
-      PG_DB_USERNAME: postgres
-      PG_DB_PASSWORD: postgres
       RAILS_VERSION: 7.2
 
     services:
       postgres:
         image: postgres:latest
         env:
           POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: password
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
diff --git a/.github/workflows/specs_postgres_rails80.yml b/.github/workflows/specs_postgres_rails80.yml
@@ -17,17 +17,14 @@ jobs:
 
     env:
       DB_TEST: postgres
-      PG_DB_HOST: 127.0.0.1
-      PG_DB_USERNAME: postgres
-      PG_DB_PASSWORD: postgres
       RAILS_VERSION: 8.0
 
     services:
       postgres:
         image: postgres:latest
         env:
           POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
+          POSTGRES_PASSWORD: password
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
diff --git a/extra/docker-compose.yml b/extra/docker-compose.yml
@@ -28,46 +28,40 @@ services:
     image: mysql
     platform: linux/amd64
     environment:
-      MYSQL_ROOT_PASSWORD: password
+      MYSQL_ROOT_PASSWORD: root
 
   postgres:
     image: postgres
     environment:
       POSTGRES_PASSWORD: password
 
-  app_with_mysql:
-    <<: *app
-    environment:
-      DB_TEST: mysql
-      DB_PORT: 3306
-      MYSQL_DB_HOST: mysql
-      MYSQL_DB_NAME: test_db
-      MYSQL_DB_USERNAME: root
-      MYSQL_DB_PASSWORD: password
-    depends_on:
-      - mysql
-
   app_with_mssql:
     <<: *app
     environment:
       DB_TEST: mssql
       DB_PORT: 1433
       MSSQL_DB_HOST: mssql
       MSSQL_DB_NAME: test_db
-      MSSQL_DB_USERNAME: sa
-      MSSQL_DB_PASSWORD: Pa%%w0rd
     depends_on:
       - mssql
 
+  app_with_mysql:
+    <<: *app
+    environment:
+      DB_TEST: mysql
+      DB_PORT: 3306
+      MYSQL_DB_HOST: mysql
+      MYSQL_DB_NAME: test_db
+    depends_on:
+      - mysql
+
   app_with_postgres:
     <<: *app
     environment:
       DB_TEST: postgres
       DB_PORT: 5432
       PG_DB_HOST: postgres
       PG_DB_NAME: test_db
-      PG_DB_USERNAME: postgres
-      PG_DB_PASSWORD: password
     depends_on:
       - postgres
 
diff --git a/spec/dummy/config/database.yml b/spec/dummy/config/database.yml
@@ -9,8 +9,8 @@ test: &test
   host: <%= ENV.fetch('MSSQL_DB_HOST') { '127.0.0.1' } %>
   # port: <%= ENV.fetch('MSSQL_DB_PORT') { 1433 } %>
   database: <%= ENV.fetch('MSSQL_DB_NAME') { "active_storage_db_#{Rails.version.tr('.', '')}-test" } %>
-  username: <%= ENV.fetch('MSSQL_DB_USERNAME') { '' } %>
-  password: <%= ENV.fetch('MSSQL_DB_PASSWORD') { '' } %>
+  username: <%= ENV.fetch('MSSQL_DB_USERNAME') { 'sa' } %>
+  password: <%= ENV.fetch('MSSQL_DB_PASSWORD') { 'Pa%%w0rd' } %>
   pool: <%= ENV.fetch('RAILS_MAX_THREADS') { 5 } %>
 development:
   <<: *test
@@ -24,8 +24,8 @@ test: &test
   host: <%= ENV.fetch('MYSQL_DB_HOST') { '127.0.0.1' } %>
   # port: <%= ENV.fetch('MYSQL_DB_PORT') { 3306 } %>
   database: <%= ENV.fetch('MYSQL_DB_NAME') { "active_storage_db_#{Rails.version.tr('.', '')}-test" } %>
-  username: <%= ENV.fetch('MYSQL_DB_USERNAME') { '' } %>
-  password: <%= ENV.fetch('MYSQL_DB_PASSWORD') { '' } %>
+  username: <%= ENV.fetch('MYSQL_DB_USERNAME') { 'root' } %>
+  password: <%= ENV.fetch('MYSQL_DB_PASSWORD') { 'root' } %>
   pool: <%= ENV.fetch('RAILS_MAX_THREADS') { 5 } %>
 development:
   <<: *test
@@ -38,8 +38,8 @@ test: &test
   adapter: postgresql
   host: <%= ENV.fetch('PG_DB_HOST') { '127.0.0.1' } %>
   database: <%= ENV.fetch('PG_DB_NAME') { "active_storage_db_#{Rails.version.tr('.', '')}-test" } %>
-  username: <%= ENV.fetch('PG_DB_USERNAME') { '' } %>
-  password: <%= ENV.fetch('PG_DB_PASSWORD') { '' } %>
+  username: <%= ENV.fetch('PG_DB_USERNAME') { 'postgres' } %>
+  password: <%= ENV.fetch('PG_DB_PASSWORD') { 'password' } %>
   min_messages: warning
   pool: <%= ENV.fetch('RAILS_MAX_THREADS') { 5 } %>
 development:
