diff --git a/.github/settings.yml b/.github/settings.yml index ec6a4e4..718147d 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -38,7 +38,7 @@ allow_rebase_merge: true branches: - - name: master + - &default_protection # https://developer.github.com/v3/repos/branches/#update-branch-protection # Branch Protection settings. Set to null to disable protection: @@ -59,7 +59,7 @@ branches: # Required. Require branches to be up to date before merging. strict: true # Required. The list of status checks to require in order to merge into this branch - contexts: contexts: ["test (18.x)", "test (20.x)", "license/cla"] + contexts: ["test (18.x)", "test (20.x)", "license/cla"] # Required. Enforce all configured restrictions for administrators. Set to true to enforce required status checks for repository administrators. Set to null to disable. enforce_admins: false # Required. Restrict who can push to this branch. Team and user restrictions are only available for organization-owned repositories. Set to null to disable. @@ -67,6 +67,12 @@ branches: # Prevent merge commits from being pushed to matching branches required_linear_history: true + - name: master + <<: *default_protection + + - name: beta + <<: *default_protection + # Labels: define labels for Issues and Pull Requests labels: - name: auro-wcss diff --git a/.github/workflows/testPublish.yml b/.github/workflows/testPublish.yml index bacf70e..0f56e3a 100644 --- a/.github/workflows/testPublish.yml +++ b/.github/workflows/testPublish.yml @@ -29,7 +29,7 @@ jobs: release: # Only release on push to master - if: github.event_name == 'push' && github.ref == 'refs/heads/master' + if: github.event_name == 'push' && github.ref == 'refs/heads/master' || 'refs/heads/beta' runs-on: ubuntu-latest needs: test steps: diff --git a/package.json b/package.json index 70f87f8..ebcd3a6 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,15 @@ ] }, "release": { - "branch": "master", + "branches": [ + { + "name": "main" + }, + { + "name": "beta", + "prerelease": true + } + ], "plugins": [ "@semantic-release/commit-analyzer", "@semantic-release/release-notes-generator",