diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml index 1072ca564..46b94bd3d 100644 --- a/.github/workflows/test-and-publish.yml +++ b/.github/workflows/test-and-publish.yml @@ -18,13 +18,13 @@ jobs: node-version: '16.15' - uses: bbeesley/build-test-merge-publish@main with: - main-branch: master + main-branch: main env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} GITHUB_TOKEN: ${{ secrets.GH_PA_TOKEN }} lint-commits: runs-on: ubuntu-latest - if: ${{ (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') || (github.ref != 'refs/heads/master' && github.event_name == 'push') }} + if: ${{ (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') || (github.ref != 'refs/heads/main' && github.event_name == 'push') }} timeout-minutes: 5 steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index 2e6131619..785f7eeb9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![test-and-publish](https://github.com/bbeesley/aws-blue-green-toolkit/actions/workflows/test-and-publish.yml/badge.svg)](https://github.com/bbeesley/aws-blue-green-toolkit/actions/workflows/test-and-publish.yml) [![codecov](https://codecov.io/gh/bbeesley/aws-blue-green-toolkit/branch/master/graph/badge.svg)](https://codecov.io/gh/bbeesley/aws-blue-green-toolkit) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) +[![test-and-publish](https://github.com/bbeesley/aws-blue-green-toolkit/actions/workflows/test-and-publish.yml/badge.svg)](https://github.com/bbeesley/aws-blue-green-toolkit/actions/workflows/test-and-publish.yml) [![codecov](https://codecov.io/gh/bbeesley/aws-blue-green-toolkit/branch/main/graph/badge.svg)](https://codecov.io/gh/bbeesley/aws-blue-green-toolkit) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) # aws-blue-green-toolkit diff --git a/package.json b/package.json index 67acf9039..7554f2571 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ ], "release": { "branches": [ - "master", + "main", "beta", "alpha" ],