Extract out OS and language versions as variables

alphagov · Jun 6, 2024 · 2e20362 · 2e20362
1 parent 912da6f
commit 2e20362
Showing 1 changed file with 52 additions and 48 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,9 +6,13 @@ on:
   pull_request:
     branches: [master]
 
+env:
+  RUBY_VERSION: "$RUBY_VERSION"
+  OS_VERSION: "ubuntu-24.04"
+
 jobs:
   bundle-audit:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -32,15 +36,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -50,7 +54,7 @@ jobs:
           bundle exec rake bundle:audit
 
   brakeman:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -74,15 +78,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -92,7 +96,7 @@ jobs:
           bundle exec rake brakeman:check
 
   spec-admin-controllers:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -116,15 +120,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -138,7 +142,7 @@ jobs:
           bundle exec rake spec:controllers
 
   spec-public-controllers:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -162,15 +166,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -184,7 +188,7 @@ jobs:
           bundle exec rake spec:controllers
 
   spec-jobs:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -208,15 +212,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -230,7 +234,7 @@ jobs:
           bundle exec rake spec:jobs
 
   spec-mailers:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -254,15 +258,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -276,7 +280,7 @@ jobs:
           bundle exec rake spec
 
   spec-models:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -300,15 +304,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -322,7 +326,7 @@ jobs:
           bundle exec rake spec
 
   spec-requests:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -346,15 +350,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -368,7 +372,7 @@ jobs:
           bundle exec rake spec
 
   spec-other:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -392,15 +396,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -414,7 +418,7 @@ jobs:
           bundle exec rake spec
 
   javascript:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -438,15 +442,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -459,7 +463,7 @@ jobs:
           bundle exec rake jasmine:ci
 
   cucumber-admin:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -483,15 +487,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup
@@ -524,7 +528,7 @@ jobs:
           bundle exec rake cucumber
 
   cucumber-public:
-    runs-on: ubuntu-24.04
+    runs-on: $OS_VERSION
 
     services:
       postgres:
@@ -548,15 +552,15 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "$RUBY_VERSION"
 
       - name: Setup gem cache
         uses: actions/cache@v4
         with:
           path: vendor/bundle
-          key: ubuntu-24.04-gems-${{ hashFiles('/Gemfile.lock') }}
+          key: $OS_VERSION-gems-${{ hashFiles('/Gemfile.lock') }}
           restore-keys: |
-            ubuntu-24.04-gems-
+            $OS_VERSION-gems-
 
       - name: Setup
         uses: ./.github/actions/setup