Use main as the default branch.

Author: wps132230

CI/binary-release-pipeline/template.yml

@@ -530,7 +530,7 @@ Resources:
           - - Type: EVENT
               Pattern: PUSH
             - Type: HEAD_REF
-              Pattern: ^refs/heads/master$
+              Pattern: ^refs/heads/main$
       Artifacts:
         Type: S3
         Location: !Ref BinaryReleaseS3BucketName

CI/trebuchet-release-pipeline/buildspec_push_to_github.yml

@@ -8,9 +8,9 @@ phases:
       - python3 aws-sdk-cpp/CI/trebuchet-release-pipeline/UpdateStatus.py -s PushToGithub -i "$RELEASE_ID" -m "Step 4 of 4. Pushing Code to Public Github." -b $CODEBUILD_BUILD_SUCCEEDING
       - cd aws-sdk-cpp
       # Verify the candidate commit, in case there is new merge without testing during release.
-      - if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then exit 1; fi;
+      - if [ "$(git rev-parse --abbrev-ref HEAD)" != "main" ]; then exit 1; fi;
       - git fetch --all
-      - if [ -n "$(git diff master origin/master)" ]; then exit 1; fi;
+      - if [ -n "$(git diff main origin/main)" ]; then exit 1; fi;
       # Get highest tag number
       - export VERSION=$(git describe --abbrev=0 --tags)
       # Calculate new version
@@ -32,7 +32,7 @@ phases:
       - git config --global user.email "$GIT_COMMIT_AUTHOR_EMAIL"
       - git commit -m "$COMMIT_MSG"
       - git checkout release-candidate
-      - git merge master
+      - git merge main
       - git push origin release-candidate
       # Get current hash and see if it already has a tag
       - export GIT_COMMIT=$(git rev-parse HEAD)
@@ -52,11 +52,13 @@ phases:
       # - git reset --hard HEAD
       # - git checkout release-candidate
       # - git pull
-      - git checkout master
+      - git checkout main
       - git pull
       - git merge release-candidate
-      - git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${GITHUB_PRIVATE_REPOSITORY}.git master
-      - git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${GITHUB_PUBLIC_REPOSITORY}.git master
+      - git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${GITHUB_PRIVATE_REPOSITORY}.git main
+      - git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${GITHUB_PRIVATE_REPOSITORY}.git main:master
+      - git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${GITHUB_PUBLIC_REPOSITORY}.git main
+      - git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${GITHUB_PUBLIC_REPOSITORY}.git main:master
       - git push --tags https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${GITHUB_PUBLIC_REPOSITORY}.git
   post_build:
      commands:

CI/trebuchet-release-pipeline/template.yml

@@ -34,7 +34,7 @@
 # |   1. Bump the patch part of the version               |
 # |   2. Commit the changes to release-candidate branch   |
 # |   3. Tag the release candidate branch                 |
-# |   4. Merge release-candidate to master                |
+# |   4. Merge release-candidate to main branch           |
 # |   5. Push the changes to private repo                 |
 # |   6. Push the changes to public repo                  |
 # +-------------------------------------------------------+