diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6e50e7a62..87a8d1412 100644 --- 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 index 948ec6ed5..96146e72b 100644 --- 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,14 +89,20 @@ 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' @@ -104,3 +110,5 @@ jobs: 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 index ca3b682b6..9622aadf2 100644 --- 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).