Merge pull request #472 from x-govuk/add-permit-merge-job-to-workflow

Add permit-merge job to workflow

.github/workflows/codeql.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
@@ -48,11 +48,11 @@ jobs:
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        
+
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-        
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
@@ -61,7 +61,7 @@ jobs:
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |

.github/workflows/publish.yml

@@ -10,7 +10,7 @@ jobs:
     name: Publish to RubyGems.org and GitHub Packages
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.tag }}
 

.github/workflows/tests.yml

@@ -12,10 +12,10 @@ jobs:
       matrix:
         ruby: ['3.1.4', '3.2.3', '3.3.0']
         rails: ['6.1.7', '7.0.6']
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Testing with Ruby ${{ matrix.ruby }} and Rails ${{ matrix.rails }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -34,11 +34,11 @@ jobs:
           SIMPLECOV: '0'
         run: make rspec
 
-  quality_checks:
-    runs-on: ubuntu-20.04
+  quality-checks:
+    runs-on: ubuntu-latest
     name: Code quality, test coverage and documentation checks
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -81,3 +81,9 @@ jobs:
 
       - name: Run Guide Check
         run: make slim-lint
+  permit-merge:
+    name: Permit merge
+    needs: [rspec, quality-checks]
+    runs-on: ubuntu-latest
+    steps:
+      - run: "echo 'All checks passed ✅'"