From 1b2c389e2393b0a3a0c7f363e31e8323a0c93ac5 Mon Sep 17 00:00:00 2001 From: WalterMoar Date: Wed, 16 Nov 2022 21:33:31 +0000 Subject: [PATCH] Switch default branch to "main" --- .github/workflows/README.md | 2 +- .github/workflows/{master-deploy.yaml => main-deploy.yaml} | 2 +- .github/workflows/reusable-appointment-frontend-cypress.yaml | 2 +- .github/workflows/reusable-build-dockerfile.yaml | 2 +- .github/workflows/reusable-build-s2i.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename .github/workflows/{master-deploy.yaml => main-deploy.yaml} (99%) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 160ea563d..8648b1bc1 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -11,7 +11,7 @@ The GitHub Action `pull-request-deploy.yaml` is only run manually. It will: - Run OWASP ZAP tests - Run Newman tests if the deployment environment is The Q dev -The GitHub Action `master-deploy.yaml` is only run manually. It will: +The GitHub Action `main-deploy.yaml` is only run manually. It will: - Run Cypress tests against the Appointment Frontend - Build images using Dockerfile and Source to Image (S2I) builds diff --git a/.github/workflows/master-deploy.yaml b/.github/workflows/main-deploy.yaml similarity index 99% rename from .github/workflows/master-deploy.yaml rename to .github/workflows/main-deploy.yaml index 2137bdc30..202e7f6a8 100644 --- a/.github/workflows/master-deploy.yaml +++ b/.github/workflows/main-deploy.yaml @@ -1,4 +1,4 @@ -name: Master Deploy +name: Main Deploy concurrency: group: ${{ github.workflow }} cancel-in-progress: true diff --git a/.github/workflows/reusable-appointment-frontend-cypress.yaml b/.github/workflows/reusable-appointment-frontend-cypress.yaml index bc407ec85..64a7531d4 100644 --- a/.github/workflows/reusable-appointment-frontend-cypress.yaml +++ b/.github/workflows/reusable-appointment-frontend-cypress.yaml @@ -5,7 +5,7 @@ on: ref: required: false type: string - default: master + default: main secrets: bceid-endpoint: required: true diff --git a/.github/workflows/reusable-build-dockerfile.yaml b/.github/workflows/reusable-build-dockerfile.yaml index 55ea40c5b..ba1fd3807 100644 --- a/.github/workflows/reusable-build-dockerfile.yaml +++ b/.github/workflows/reusable-build-dockerfile.yaml @@ -5,7 +5,7 @@ on: ref: required: false type: string - default: master + default: main directory: required: true type: string diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index a947d80f3..4bbdadc73 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -5,7 +5,7 @@ on: ref: required: false type: string - default: master + default: main directory: required: true type: string