Switch base branch name to main (#353)

Set everything to use main branch name

Author: JackPlowman

.github/workflows/code-quality.yml

@@ -1,7 +1,7 @@
 name: "Check code format and quality"
 on:
   push:
-    branches: [develop, master]
+    branches: [develop, main]
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

Makefile

@@ -506,7 +506,7 @@ tag-commit-for-deployment: # Tag git commit for deployment - mandatory: PROFILE=
 		make git-tag-create-environment-deployment COMMIT=$(COMMIT)
 	else
 		echo PROFILE=$(PROFILE) should equal ENVIRONMENT=$(ENVIRONMENT)
-		echo Recommended: you run this command from the master branch
+		echo Recommended: you run this command from the main branch
 	fi
 
 tag-commit-to-destroy-environment: # Tag git commit to destroy deployment - mandatory: ENVIRONMENT=[di-number], COMMIT=[short commit hash]

README.md

@@ -424,7 +424,7 @@ The production pipeline terraform stack must be deployed
 
 To deploy an update/new version to a production environment the commit must be tagged using the command below. This will automatically run a Github web hook that will trigger an AWS Codebuild project that will deploy the environment based on the git tag.
 
-Note: This should only be run against a commit on the master branch as the code has been built into an image and pushed to ECR. Also short commit hash is the first 7 characters of the commit hash.
+Note: This should only be run against a commit on the main branch as the code has been built into an image and pushed to ECR. Also short commit hash is the first 7 characters of the commit hash.
 
 To Deploy Demo
 

application/.gitignore

@@ -1,5 +1,5 @@
 # =====================================================================================================================
-# SEE: https://github.com/github/gitignore/blob/master/Python.gitignore
+# SEE: https://github.com/github/gitignore/blob/main/Python.gitignore
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

build/automation/bin/git-secrets

@@ -185,7 +185,7 @@ prepare_commit_msg_hook() {
     merge,)
       local git_head=$(env | grep GITHEAD)  # e.g. GITHEAD_<sha>=release/1.43
       local sha="${git_head##*=}"           # Get just the SHA
-      local branch=$(git symbolic-ref HEAD) # e.g. refs/heads/master
+      local branch=$(git symbolic-ref HEAD) # e.g. refs/heads/main
       local dest="${branch#refs/heads/}"    # cut out "refs/heads"
       git log "${dest}".."${sha}" -p | scan_with_fn_or_die "scan" -
       ;;

build/automation/var/README.md

@@ -8,7 +8,7 @@ Profile is a set of configuration options specific to an environment expressed a
 
 * `local` - local development profile (Not attached to an AWS Account)
 * `task` - a specific environment for branches. This should be default for creating non-prod infrastructure (AWS Non-prod Account)
-* `dev` - shared development profile that supports automation on every commit to the remote master branch in the CI pipeline or it is used for a cleanup (AWS Non-prod Account)
+* `dev` - shared development profile that supports automation on every commit to the remote main branch in the CI pipeline or it is used for a cleanup (AWS Non-prod Account)
 * `test` - test profile that runs nightly in the CI pipeline (AWS Non-prod Account)
 * `demo` - production, UX (AWS Prod Account)
 * `live` - production, service (AWS Prod Account)

documentation/CONTRIBUTING.md

@@ -132,13 +132,13 @@ Upload the public key to your GitHub and GitLab accounts using the links below.
 Principles to follow
 
 - A direct merge to the canonical branch is not allowed and can only be done by creating a pull request (merge request)
-- If not stated otherwise the only long-lived branch is master, i.e. canonical branch
-- Any new branch should be created from master
+- If not stated otherwise the only long-lived branch is main, i.e. canonical branch
+- Any new branch should be created from main
 - The preferred short-lived branch name format is `task/JIRA-XXX_Descriptive_branch_name`
 - The preferred hotfix branch name format is `bugfix/JIRA-XXX_Descriptive_branch_name`
 - All commits must be cryptographically signed
 - Commits should be made often and pushed to the remote
-- Use rebase to get the latest commits from the master while working with a short-lived or a bugfix branch
+- Use rebase to get the latest commits from the main while working with a short-lived or a bugfix branch
 - Squash commits when appropriate
 - Merge commits are not allowed
 
@@ -174,38 +174,38 @@ Contributing to an already existing branch
     git commit -S -m "Meaningful description of change"
     git push
 
-Rebasing a branch onto master
+Rebasing a branch onto main
 
     git checkout task/JIRA-XXX_Descriptive_branch_name
     git rebase -i HEAD~X                                # Squash X number of commits, all into one
     # When prompted change commit type to `squash` for all the commits except the top one
     # On the following screen replace pre-inserted comments by a single summary
     git push --force-with-lease
 
-    git checkout master
+    git checkout main
     git pull
     git checkout task/JIRA-XXX_Descriptive_branch_name
-    git rebase master
+    git rebase main
     # Resolve conflicts
     git add .
     git rebase --continue
     git push --force-with-lease
 
-Merging a branch to master - this should be done only in an exceptional circumstance as the proper process is to raise an MR
+Merging a branch to main - this should be done only in an exceptional circumstance as the proper process is to raise an MR
 
-    git checkout master
-    git pull --prune                                    # Make sure master is up-to-date
+    git checkout main
+    git pull --prune                                    # Make sure main is up-to-date
     git checkout task/JIRA-XXX_Descriptive_branch_name
     git pull                                            # Make sure the task branch is up-to-date
 
     git rebase -i HEAD~X                                # Squash X number of commits, all into one
     # When prompted change commit type to `squash` for all the commits except the top one
     # On the following screen replace pre-inserted comments by a single summary
 
-    git rebase master                                   # Rebase the task branch on top of master
-    git checkout master                                 # Switch to master branch
+    git rebase main                                   # Rebase the task branch on top of main
+    git checkout main                                 # Switch to main branch
     git merge -ff task/JIRA-XXX_Descriptive_branch_name # Fast-forward merge
-    git push                                            # Push master to remote
+    git push                                            # Push main to remote
 
     git push -d origin task/JIRA-XXX_Descriptive_branch_name   # Remove remote branch
     git branch -d task/JIRA-XXX_Descriptive_branch_name        # Remove local branch
@@ -252,15 +252,15 @@ Git hooks are located in `build/automation/etc/githooks/scripts` and executed au
 
 ### Git tags
 
-Aim at driving more complex deployment workflows by tags with an exception of the master branch where the continuous deployment to a development environment should be enabled by default.
+Aim at driving more complex deployment workflows by tags with an exception of the main branch where the continuous deployment to a development environment should be enabled by default.
 
 ## Pull request (merge request)
 
 - Set the title to `JIRA-XXX Descriptive branch name`, where `JIRA-XXX` is the ticket reference number
 - Ensure all commits will be squashed and the source branch will be removed once the request is accepted
 - Notify the team on Slack to give your colleagues opportunity to review changes and share the knowledge
 - If the change has not been pair or mob programmed it must follow the code review process and be approved by at least one peer, all discussions must be resolved
-- A merge to master must be squashed and rebased on top, preserving the list of all commit messages
+- A merge to main must be squashed and rebased on top, preserving the list of all commit messages
 
 ## Code review
 

documentation/ONBOARDING.md

@@ -32,7 +32,7 @@ This is a generic onboarding template that can be used by any team to help to br
 
 ### Technical Setup
 
-- macOS [configuration](https://github.com/nhsd-exeter/make-devops/blob/master/build/automation/lib/macos/README.md)
+- macOS [configuration](https://github.com/nhsd-exeter/make-devops/blob/main/build/automation/lib/macos/README.md)
 - CPaaS Texas VPN access
 - [GitLab](https://gitlab.mgmt.texasplatform.uk/)
 - [Jenkins](https://jenkins.mgmt.texasplatform.uk/)

documentation/TODO.md

@@ -13,7 +13,7 @@
 
 List here all the technical tasks for prioritisation that need to be discussed with the team but are not ready yet to be placed on the backlog. This should form a holistic view of the state of the project and show the direction for incremental development and refactoring of certain areas of the software listed below. The idea behind this list is to ensure backlog hygiene and that it only consists of stories that can be completed within the next two sprints. Therefore, the focus can be changed dynamically depending on the business need.
 
-This document must be discussed regularly with the Tech Lead and considered in the context of the [Engineering Quality Checks](https://github.com/NHSDigital/software-engineering-quality-framework/blob/master/quality-checks.md) provided as a guidance by NHS Digital Product Development directorate.
+This document must be discussed regularly with the Tech Lead and considered in the context of the [Engineering Quality Checks](https://github.com/NHSDigital/software-engineering-quality-framework/blob/main/quality-checks.md) provided as a guidance by NHS Digital Product Development directorate.
 
 ## Regular tasks
 

infrastructure/.gitignore

@@ -1,5 +1,5 @@
 # =====================================================================================================================
-# SEE: https://github.com/github/gitignore/blob/master/Terraform.gitignore
+# SEE: https://github.com/github/gitignore/blob/main/Terraform.gitignore
 
 # Local .terraform directories
 **/.terraform/*