From 044492577a516695f0301e6530c363b3a87211c5 Mon Sep 17 00:00:00 2001 From: George Plukov Date: Wed, 14 Jul 2021 13:07:52 -0400 Subject: [PATCH] Add default branch to semantic release, update docs --- .github/workflows/release.yml | 3 ++- README.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b1f4375..7a879b3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: push: branches: - - master + - main - '[0-9]+.x' - '[0-9]+.[0-9]+.x' jobs: @@ -21,6 +21,7 @@ jobs: - name: Semantic Release uses: BrightspaceUI/actions/semantic-release@master with: + DEFAULT_BRANCH: main GITHUB_TOKEN: ${{ secrets.D2L_GITHUB_TOKEN }} NPM: true NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/README.md b/README.md index eb3ec2b..8451ba8 100644 --- a/README.md +++ b/README.md @@ -226,7 +226,7 @@ Contributions are welcome, please submit a pull request! ## Versioning & Releasing -> TL;DR: Commits prefixed with `fix:` and `feat:` will trigger patch and minor releases when merged to `master`. Read on for more details... +> TL;DR: Commits prefixed with `fix:` and `feat:` will trigger patch and minor releases when merged to `main`. Read on for more details... The [sematic-release GitHub Action](https://github.com/BrightspaceUI/actions/tree/master/semantic-release) is called from the `release.yml` GitHub Action workflow to handle version changes and releasing.