From 645dc989558a3b8d44c5584a622e1ed56f6423ac Mon Sep 17 00:00:00 2001
From: Yannik Daellenbach <daellenbach@puzzle.ch>
Date: Mon, 5 Feb 2024 16:24:07 +0100
Subject: [PATCH] Use job environment variables

---
 .github/workflows/rails.yml | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/rails.yml b/.github/workflows/rails.yml
index 853e6a064..762c99f05 100644
--- a/.github/workflows/rails.yml
+++ b/.github/workflows/rails.yml
@@ -4,14 +4,20 @@ jobs:
   tests:
     runs-on: ubuntu-latest
 
+    env:
+      PGHOST: localhost
+      POSTGRES_DB: skills_test
+      POSTGRES_USER: skills
+      POSTGRES_PASSWORD: skills
+
     services:
       postgres:
         image: postgres:16
-        env:
-          POSTGRES_DB: skills_test
-          POSTGRES_USER: skills
-          POSTGRES_PASSWORD: skills
         ports: ["5432:5432"]
+        env:
+          POSTGRES_DB: ${{ env.POSTGRES_DB }}
+          POSTGRES_USER: ${{ env.POSTGRES_USER }}
+          POSTGRES_PASSWORD: ${{ env.POSTGRES_PASSWORD }}
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -33,20 +39,19 @@ jobs:
       - name: 'Run database migrations'
         env:
           RAILS_ENV: test
-          PGHOST: localhost
-          POSTGRES_DB: skills_test
-          POSTGRES_USER: skills
-          POSTGRES_PASSWORD: skills
+          PGHOST: ${{ env.PGHOST }}
+          POSTGRES_DB: ${{ env.POSTGRES_DB }}
+          POSTGRES_USER: ${{ env.POSTGRES_USER }}
+          POSTGRES_PASSWORD: ${{ env.POSTGRES_PASSWORD }}
         run: |
           bundle exec rake db:create db:migrate
 
       - name: 'Run tests'
         env:
-          PGHOST: localhost
-          POSTGRES_DB: skills_test
-          POSTGRES_USER: skills
-          POSTGRES_PASSWORD: skills
-          PGPORT: ${{ job.services.postgres.ports[5432] }}
+          PGHOST: ${{ env.PGHOST }}
+          POSTGRES_DB: ${{ env.POSTGRES_DB }}
+          POSTGRES_USER: ${{ env.POSTGRES_USER }}
+          POSTGRES_PASSWORD: ${{ env.POSTGRES_PASSWORD }}
         run: bundle exec rake
 
       - name: 'Run RuboCop'