Merge pull request #6175 from NHSDigital/next

Author: thomasleese

.github/workflows/build-and-push-image.yml

@@ -99,7 +99,7 @@ jobs:
       - name: Save web image
         run: docker save -o image.tar mavis-webapp:latest
       - name: Upload web image
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: webapp-image
           path: image.tar
@@ -108,7 +108,7 @@ jobs:
       - name: Save ops image
         run: docker save -o image.tar mavis-ops:latest
       - name: Upload ops image
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ops-image
           path: image.tar
@@ -123,7 +123,7 @@ jobs:
         image_type: ["webapp", "ops"]
     steps:
       - name: Download Docker image
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: ${{ matrix.image_type }}-image
       - name: Configure AWS Credentials

.github/workflows/data-replication-pipeline.yml

@@ -131,7 +131,7 @@ jobs:
       - name: Rename task definition file
         run: mv ${{ steps.create-task-definition.outputs.task-definition }} ${{ runner.temp }}/data-replication-task-definition.json
       - name: Upload artifact for data-replication task definition
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ inputs.environment }}-data-replication-task-definition
           path: ${{ runner.temp }}/data-replication-task-definition.json
@@ -183,7 +183,7 @@ jobs:
           role-to-assume: ${{ env.aws_role }}
           aws-region: eu-west-2
       - name: Download data-replication task definition artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           path: ${{ runner.temp }}
           name: ${{ inputs.environment }}-data-replication-task-definition

.github/workflows/deploy.yml

@@ -134,7 +134,7 @@ jobs:
       - name: Rename task definition file
         run: mv ${{ steps.create-task-definition.outputs.task-definition }} ${{ runner.temp }}/${{ matrix.service }}-task-definition.json
       - name: Upload artifact for ${{ matrix.service }} task definition
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: ${{ inputs.environment }}-${{ matrix.service }}-task-definition
           path: ${{ runner.temp }}/${{ matrix.service }}-task-definition.json
@@ -186,7 +186,7 @@ jobs:
           role-to-assume: arn:aws:iam::${{ env.aws_account_id }}:role/GithubDeployECSService
           aws-region: eu-west-2
       - name: Download ops task definition artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           path: ${{ runner.temp }}
           name: ${{ inputs.environment }}-ops-task-definition
@@ -313,7 +313,7 @@ jobs:
           role-to-assume: arn:aws:iam::${{ env.aws_account_id }}:role/GithubDeployECSService
           aws-region: eu-west-2
       - name: Download ${{ matrix.service }} task definition artifact
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           path: ${{ runner.temp }}
           name: ${{ inputs.environment }}-${{ matrix.service }}-task-definition
@@ -345,10 +345,10 @@ jobs:
     name: Notify deployment status
     runs-on: ubuntu-latest
     needs: [ deploy-service, run-migrations ]
-    if: ${{ !cancelled() }}
+    if: ${{ !cancelled() && inputs.environment == 'production' }}
     steps:
       - name: Notify deployment success
-        if: ${{ env.environment == 'production' &&  needs.deploy-service.result == 'success' }}
+        if: ${{ needs.deploy-service.result == 'success' }} 
         uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
         with:
           webhook: ${{ secrets.SLACK_MAVIS_RELEASES_WEBHOOK_URL }}
@@ -361,7 +361,7 @@ jobs:
                   type: "mrkdwn"
                   text: "*${{ env.app_version }}* is deployed :ship:"
       - name: Notify deployment failure
-        if: ${{ env.environment == 'production' && (needs.deploy-service.result == 'failure' || needs.run-migrations.result == 'failure') }}
+        if: ${{ needs.deploy-service.result == 'failure' || needs.run-migrations.result == 'failure' }}
         uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
         with:
           webhook: ${{ secrets.SLACK_MAVIS_RELEASES_WEBHOOK_URL }}

.github/workflows/get-tag-versions.yml

@@ -0,0 +1,67 @@
+name: Set Slack Topics
+on:
+  push:
+    branches:
+      - main
+      - release
+    tags:
+      - 'v*'
+  workflow_dispatch:
+
+jobs:
+  get-tags:
+    runs-on: ubuntu-latest
+    outputs:
+      release_tag: ${{ steps.get_tags.outputs.release_tag }}
+      main_tag: ${{ steps.get_tags.outputs.main_tag }}
+    steps:
+      - name: Checkout code and fetch tags
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+      - name: Get latest tags for branches
+        id: get_tags
+        run: |
+          branches=("release" "main")
+          for branch in "${branches[@]}"; do
+            full_branch="origin/$branch"
+            if ! git rev-parse --verify "$full_branch" >/dev/null 2>&1; then
+                echo "Branch $branch does not exist."
+                continue
+            fi
+            latest_tag=$(git tag --merged "$full_branch" | grep -p '^v\d+\.\d+\.\d+' | sort -V | tail -1)
+            if [ -n "$latest_tag" ]; then
+                echo "Latest tag on branch $branch: $latest_tag"
+                echo "${branch}_tag=$latest_tag" >> $GITHUB_OUTPUT
+            else
+                echo "No semantic version tags found on branch $branch."
+            fi
+          done
+  update-topics:
+    needs: get-tags
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set next tag
+        run: |
+          CURRENT_VERSION=${{ needs.get-tags.outputs.main_tag }}
+          major=${CURRENT_VERSION#v};
+          major=${major%%.*};
+          minor=${CURRENT_VERSION#v${major}.};
+          minor=${minor%%.*};
+          new_minor=$((minor+1));
+          patch=${CURRENT_VERSION#v${major}.${minor}.};
+          NEXT_VERSION=$(echo "v${major}.${new_minor}.${patch}")
+          echo "next_tag=$NEXT_VERSION" >> $GITHUB_ENV
+      - name: Create channel topic
+        run: |
+          TOPIC="release: ${{ needs.get-tags.outputs.release_tag }} - main: ${{ needs.get-tags.outputs.main_tag }} - next: $next_tag"
+          echo "MAVIS_TECH_TOPIC=$TOPIC" >> $GITHUB_ENV
+      - name: Update mavis tech channel topic
+        uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a
+        with:
+          method: conversations.setTopic
+          token: ${{ secrets.MAVIS_DEPLOYMENT_BOT_OAUTH_TOKEN }}
+          errors: true
+          payload: |
+            channel: ${{ secrets.MAVIS_TECH_CHANNEL_ID }}
+            topic: "${{ env.MAVIS_TECH_TOPIC }}"

.gitignore

@@ -89,4 +89,4 @@ dump.rdb
 
 # Data that gets downloaded by CLI tools
 db/data/dfe-schools.zip
-db/data/nhs-gp-practices.zip
+db/data/nhs-gp-practices.csv

.ruby-version

@@ -1 +1 @@
-ruby-4.0.0
+ruby-4.0.1

.tool-versions

@@ -4,4 +4,4 @@ nodejs      22.15.0
 pkl         0.28.1
 postgres    17.2
 redis       8.2.1
-ruby        4.0.0
+ruby        4.0.1

CONTRIBUTING.md

@@ -0,0 +1,11 @@
+# Contributing
+
+## Code reviews
+
+All pull requests should be reviewed by another developer on the team before
+they can be merged in.
+
+Don't be afraid to use "Request changes" when suggesting changes to a pull
+request. This helps to make it easier to filter in lists of pull requests
+which are still in need of a review, and the person who raised the pull
+request can still dismiss the review if they disagree.

Dockerfile

@@ -2,7 +2,7 @@
 # check=error=true
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version
-ARG RUBY_VERSION=4.0.0
+ARG RUBY_VERSION=4.0.1
 ARG BUNDLE_WITHOUT="development:test"
 ARG RAILS_ENV="production"
 FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base

Gemfile.lock

@@ -128,13 +128,13 @@ GEM
     array_enum (1.6.0)
       activemodel
     asciidoctor (2.0.26)
-    asciidoctor-diagram (3.1.0)
+    asciidoctor-diagram (3.2.0)
       asciidoctor (>= 1.5.7, < 3.x)
       rexml
     ast (2.4.3)
     attr_required (1.0.2)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1219.0)
+    aws-partitions (1.1220.0)
     aws-sdk-accessanalyzer (1.85.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
@@ -146,10 +146,10 @@ GEM
       bigdecimal
       jmespath (~> 1, >= 1.6.1)
       logger
-    aws-sdk-ec2 (1.604.0)
+    aws-sdk-ec2 (1.606.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
-    aws-sdk-ecr (1.121.0)
+    aws-sdk-ecr (1.122.0)
       aws-sdk-core (~> 3, >= 3.241.4)
       aws-sigv4 (~> 1.5)
     aws-sdk-iam (1.140.0)
@@ -178,7 +178,7 @@ GEM
     bindex (0.8.1)
     bootsnap (1.23.0)
       msgpack (~> 1.2)
-    brakeman (8.0.2)
+    brakeman (8.0.4)
       racc
     builder (3.3.0)
     capybara (3.40.0)
@@ -190,7 +190,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    capybara-screenshot (1.0.26)
+    capybara-screenshot (1.0.27)
       capybara (>= 1.0, < 4)
       launchy
     caxlsx (4.4.1)
@@ -279,14 +279,14 @@ GEM
       date_time_precision (>= 0.8)
       mime-types (>= 3.0)
       nokogiri (>= 1.11.4)
-    flipper (1.3.6)
+    flipper (1.4.0)
       concurrent-ruby (< 2)
-    flipper-active_record (1.3.6)
+    flipper-active_record (1.4.0)
       activerecord (>= 4.2, < 9)
-      flipper (~> 1.3.6)
-    flipper-ui (1.3.6)
+      flipper (~> 1.4.0)
+    flipper-ui (1.4.0)
       erubi (>= 1.0.0, < 2.0.0)
-      flipper (~> 1.3.6)
+      flipper (~> 1.4.0)
       rack (>= 1.4, < 4)
       rack-protection (>= 1.5.3, < 5.0.0)
       rack-session (>= 1.0.2, < 3.0.0)
@@ -476,7 +476,7 @@ GEM
       reline (>= 0.6.0)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
-    pstore (0.2.0)
+    pstore (0.2.1)
     psych (5.3.1)
       date
       stringio
@@ -527,8 +527,8 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails_semantic_logger (4.19.0)
       rack
@@ -585,7 +585,7 @@ GEM
     rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.2)
+    rspec-rails (8.0.3)
       actionpack (>= 7.2)
       activesupport (>= 7.2)
       railties (>= 7.2)
@@ -657,15 +657,15 @@ GEM
     securerandom (0.4.1)
     semantic_logger (4.17.0)
       concurrent-ruby (~> 1.0)
-    sentry-rails (6.3.1)
+    sentry-rails (6.4.1)
       railties (>= 5.2.0)
-      sentry-ruby (~> 6.3.1)
-    sentry-ruby (6.3.1)
+      sentry-ruby (~> 6.4.1)
+    sentry-ruby (6.4.1)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
       logger
-    sentry-sidekiq (6.3.1)
-      sentry-ruby (~> 6.3.1)
+    sentry-sidekiq (6.4.1)
+      sentry-ruby (~> 6.4.1)
       sidekiq (>= 5.0)
     shoulda-matchers (7.0.1)
       activesupport (>= 7.1)
@@ -917,7 +917,7 @@ DEPENDENCIES
   with_advisory_lock
 
 RUBY VERSION
-  ruby 4.0.0
+  ruby 4.0.1
 
 BUNDLED WITH
   4.0.3