From 33e615a6fce6c9508c7079ed993849ddc1c463e5 Mon Sep 17 00:00:00 2001
From: Sean Rankine <sean.rankine@me.com>
Date: Wed, 4 Jan 2023 11:57:10 +0000
Subject: [PATCH 1/2] Reference workflows with yml extensions

This updates workflows files to reference resuable workflows with the `.yml`
extension instead of the `.yaml` extension. This is a part of making the name
convention consistent across our repos.
---
 .github/workflows/deploy.yaml                | 4 ++--
 .github/workflows/set-automatic-deploys.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
index ad8a9ee90..5ab081bef 100644
--- a/.github/workflows/deploy.yaml
+++ b/.github/workflows/deploy.yaml
@@ -28,7 +28,7 @@ jobs:
   build-and-publish-image:
     if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
     name: Build and publish image
-    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-image.yaml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-image.yml@main
     with:
       gitRef: ${{ inputs.gitRef || github.ref }}
     secrets:
@@ -37,7 +37,7 @@ jobs:
   trigger-deploy:
     name: Trigger deploy to ${{ inputs.environment || 'integration' }}
     needs: build-and-publish-image
-    uses: alphagov/govuk-infrastructure/.github/workflows/deploy.yaml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/deploy.yml@main
     with:
       imageTag: ${{ needs.build-and-publish-image.outputs.imageTag }}
       environment: ${{ inputs.environment || 'integration' }}
diff --git a/.github/workflows/set-automatic-deploys.yaml b/.github/workflows/set-automatic-deploys.yaml
index 0c3212a0a..9efb1c4c0 100644
--- a/.github/workflows/set-automatic-deploys.yaml
+++ b/.github/workflows/set-automatic-deploys.yaml
@@ -26,7 +26,7 @@ on:
 jobs:
   set-automatic-deploys:
     name: Set automatic deploys
-    uses: alphagov/govuk-infrastructure/.github/workflows/set-automatic-deploys.yaml@main
+    uses: alphagov/govuk-infrastructure/.github/workflows/set-automatic-deploys.yml@main
     with:
       automaticDeploysEnabled: ${{ github.event.inputs.setAutomaticDeploys == 'enabled' }}
       environment: ${{ github.event.inputs.environment }}

From b9d68ee3678b4d818175d3bde168c2add0934d72 Mon Sep 17 00:00:00 2001
From: Sean Rankine <sean.rankine@me.com>
Date: Wed, 4 Jan 2023 11:57:10 +0000
Subject: [PATCH 2/2] Use `.yml` extension for workflow files

This updates the workflow files to use `.yml` instead of `.yaml`. This makes
the use of the yaml file extension consistent across repositories.
---
 .github/workflows/{deploy.yaml => deploy.yml}                     | 0
 .../{set-automatic-deploys.yaml => set-automatic-deploys.yml}     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{deploy.yaml => deploy.yml} (100%)
 rename .github/workflows/{set-automatic-deploys.yaml => set-automatic-deploys.yml} (100%)

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yml
similarity index 100%
rename from .github/workflows/deploy.yaml
rename to .github/workflows/deploy.yml
diff --git a/.github/workflows/set-automatic-deploys.yaml b/.github/workflows/set-automatic-deploys.yml
similarity index 100%
rename from .github/workflows/set-automatic-deploys.yaml
rename to .github/workflows/set-automatic-deploys.yml