From 9fb8f5b76e54f96eb53e72c29252242d4c32a0d1 Mon Sep 17 00:00:00 2001
From: cairnsj <51908793+killij@users.noreply.github.com>
Date: Tue, 21 Nov 2023 11:57:52 +0000
Subject: [PATCH] Add 'next' branch to github actions

---
 .github/workflows/create-release.yml   |  1 +
 .github/workflows/docker-publish.yml   |  2 +-
 .github/workflows/dotnet.yml           |  2 +-
 .github/workflows/end-to-end-test.yml  | 42 --------------------------
 .github/workflows/sonarqube.yml        |  2 +-
 .github/workflows/terraform-fmt.yml    |  2 +-
 .github/workflows/terraform-tflint.yml |  2 +-
 .releaserc                             |  2 +-
 8 files changed, 7 insertions(+), 48 deletions(-)
 delete mode 100644 .github/workflows/end-to-end-test.yml

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index ca55ca2e..bf1d67ad 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - next
 
 permissions:
   contents: read # for checkout
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index d0059620..b6d09826 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -48,7 +48,7 @@ jobs:
         run: echo "IMAGE_TAGS=${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LOWER }}:${{ env.RELEASE_TAG }}" >> $GITHUB_ENV
 
       - name: Add latest tag if we're not production release
-        if: contains(env.RELEASE_TAG, 'pre')
+        if: contains(env.RELEASE_TAG, 'next')
         run: echo "IMAGE_TAGS=${IMAGE_TAGS},${{ env.REGISTRY }}/${{ env.IMAGE_NAME_LOWER }}:latest" >> $GITHUB_ENV
 
       #debug
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 28b43904..0749deea 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -5,7 +5,7 @@ name: .NET Test
 
 on: 
   pull_request:
-    branches: [ "master", "main" ]
+    branches: [ "main", "next" ]
 
 jobs:
   test:
diff --git a/.github/workflows/end-to-end-test.yml b/.github/workflows/end-to-end-test.yml
deleted file mode 100644
index 4f95b088..00000000
--- a/.github/workflows/end-to-end-test.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: End to End Testing
-
-on:
-  workflow_dispatch:
-    inputs:
-      environment:
-        description: 'Target environment for the End to End tests'
-        required: true
-        default: dev
-        type: choice
-        options:
-          - dev
-          - test
-          - pre-prod
-
-jobs:
-  end-to-end-testing:
-    runs-on: ubuntu-latest
-    concurrency: e2e-${{ inputs.environment }}
-
-    steps:
-      - name: checkout
-        uses: actions/checkout@v2
-
-      - name: Cypress run
-        uses: cypress-io/github-action@v4
-        with:
-          working-directory: ./Childrens-Social-Care-CPD-Tests
-          config: baseUrl=https://${{ inputs.environment }}.develop-child-family-social-work-career.education.gov.uk/
-
-      - name: Store screenshots on test failure
-        uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: cypress-screenshots
-          path: Childrens-Social-Care-CPD-Tests/cypress/screenshots
-      - name: Store videos
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: cypress-videos
-          path: Childrens-Social-Care-CPD-Tests/cypress/videos
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
index 2d0f6db6..a8146525 100644
--- a/.github/workflows/sonarqube.yml
+++ b/.github/workflows/sonarqube.yml
@@ -2,8 +2,8 @@
     on:
       pull_request:
         branches:
-          - master
           - main
+          - next
     jobs:
       code-analysis:
         name: Static code analysis
diff --git a/.github/workflows/terraform-fmt.yml b/.github/workflows/terraform-fmt.yml
index 9e12386e..15c34692 100644
--- a/.github/workflows/terraform-fmt.yml
+++ b/.github/workflows/terraform-fmt.yml
@@ -2,7 +2,7 @@ name: 'Terraform Format'
 
 on: 
   pull_request:
-    branches: [ "master", "main" ]
+    branches: [ "main". "next" ]
 
 jobs:
   terraform-fmt:
diff --git a/.github/workflows/terraform-tflint.yml b/.github/workflows/terraform-tflint.yml
index f36e1110..4e1fc6ad 100644
--- a/.github/workflows/terraform-tflint.yml
+++ b/.github/workflows/terraform-tflint.yml
@@ -2,7 +2,7 @@ name: 'Terraform TFLint'
 
 on: 
   pull_request:
-    branches: [ "master", "main" ]
+    branches: [ "main", "next" ]
 
 jobs:
   terraform-tflint:
diff --git a/.releaserc b/.releaserc
index 57dd8889..5b29a102 100644
--- a/.releaserc
+++ b/.releaserc
@@ -1,5 +1,5 @@
 {
-  "branches": ["main"],
+  "branches": ["main", { "name": "next", "prerelease": true }],
   "dryRun": false,
   "ci": true,
   "plugins": [