diff --git a/.github/settings.yml b/.github/settings.yml index bc80c6a..fdcbc6b 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -39,7 +39,7 @@ repository: allow_rebase_merge: true branches: - - name: main + - &default_protection # https://developer.github.com/v3/repos/branches/#update-branch-protection # Branch Protection settings. Set to null to disable protection: @@ -68,6 +68,12 @@ branches: # Prevent merge commits from being pushed to matching branches required_linear_history: true + - name: main + <<: *default_protection + + - name: beta + <<: *default_protection + # Labels: define labels for Issues and Pull Requests labels: - name: auro-header diff --git a/.github/workflows/testPublish.yml b/.github/workflows/testPublish.yml index 93ea056..3f59634 100644 --- a/.github/workflows/testPublish.yml +++ b/.github/workflows/testPublish.yml @@ -4,9 +4,9 @@ name: Test and publish # events but only for the master branch on: push: - branches: [ master ] + branches: [ master, beta ] pull_request: - branches: [ master ] + branches: [ master, beta ] # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: @@ -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 d16b119..33fd395 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,13 @@ }, "release": { "branches": [ - "master" + { + "name": "master" + }, + { + "name": "beta", + "prerelease": true + } ], "plugins": [ "@semantic-release/commit-analyzer",