Merge pull request #867 from MikeMcQuaid/move_to_main

Make `main` the default branch
MikeMcQuaid · Jan 1, 2024 · fbd4ea2 · fbd4ea2
2 parents ba5a1a2 + 5a69081
commit fbd4ea2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,10 +2,10 @@ name: CodeQL
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
   schedule:
     - cron: "39 8 * * 5"
 jobs:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,7 +2,7 @@ name: GitHub Actions CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 jobs:
   style:
@@ -89,18 +89,26 @@ jobs:
         run: |
           docker build --build-arg RUBY_VERSION=$(cat .ruby-version) --tag strap .
           docker tag strap mikemcquaid/strap:master
+          docker tag strap mikemcquaid/strap:main
+          docker tag strap mikemcquaid/strap:latest
           docker tag strap ghcr.io/mikemcquaid/strap:master
+          docker tag strap ghcr.io/mikemcquaid/strap:main
+          docker tag strap ghcr.io/mikemcquaid/strap:latest
 
       - name: Deploy the Docker image to GitHub Packages
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/main'
         run: |
           echo ${{secrets.GITHUB_TOKEN}} | \
             docker login --username=mikemcquaid --password-stdin ghcr.io
           docker push ghcr.io/mikemcquaid/strap:master
+          docker push ghcr.io/mikemcquaid/strap:main
+          docker push ghcr.io/mikemcquaid/strap:latest
 
       - name: Deploy the Docker image to Docker Hub
         if: github.ref == 'refs/heads/master'
         run: |
           echo ${{secrets.DOCKER_TOKEN}} | \
             docker login --username=mikemcquaid --password-stdin
           docker push mikemcquaid/strap:master
+          docker push mikemcquaid/strap:main
+          docker push mikemcquaid/strap:latest
diff --git a/README.md b/README.md
@@ -79,4 +79,4 @@ Stable and in active development.
 ## License
 
 Licensed under the [MIT License](https://en.wikipedia.org/wiki/MIT_License).
-The full license text is available in [LICENSE.txt](https://github.com/MikeMcQuaid/strap/blob/master/LICENSE.txt).
+The full license text is available in [LICENSE.txt](https://github.com/MikeMcQuaid/strap/blob/main/LICENSE.txt).