Skip to content

Commit

Permalink
build: update to support BETA releases
Browse files Browse the repository at this point in the history
See discussion: https://github.com/orgs/AlaskaAirlines/discussions/556

Here's a brief description of the changes:

1. `.github/settings.yml`: This file is used to configure GitHub repository settings.
   The changes made here include:
   - The branch protection rules that were previously applied to the `main` branch are
     now defined under a YAML anchor `default_protection`. This allows the same
     set of rules to be reused for multiple branches.
   - The `main` and `beta` branches are now using the `default_protection` rules.

2. `.github/workflows/testPublish.yml`: This file defines a GitHub Actions workflow.
   The changes made here include:
   - The workflow is now triggered on `push` and `pull_request` events not only for
     the `main` branch but also for the `beta` branch.
   - The `release` job now runs if the event is a `push` to either the `main`
     or `beta` branch.

3. `package.json`: This file is used to manage the project's dependencies, scripts,
   version and more. The changes made here include:
   - The `release` configuration now includes the `beta` branch in addition to the
     `main` branch. The `beta` branch is marked as `prerelease`. This means that
     releases on the `beta` branch will be marked as pre-releases.

Changes to be committed:
modified:   .github/settings.yml
modified:   .github/workflows/testPublish.yml
modified:   package.json
  • Loading branch information
blackfalcon committed Jun 19, 2024
1 parent 71ce2e8 commit 51ab82d
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 6 deletions.
10 changes: 8 additions & 2 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -60,14 +60,20 @@ 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: ["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.
restrictions: null
# 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-skeleton
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/testPublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ name: Test and publish
# events but only for the main branch
on:
push:
branches: [ main ]
branches: [ main, beta ]
pull_request:
branches: [ main ]
branches: [ main, beta ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
Expand All @@ -28,7 +28,7 @@ jobs:

release:
# Only release on push to main
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
if: github.event_name == 'push' && github.ref == 'refs/heads/main' || 'refs/heads/beta'
runs-on: ubuntu-latest
needs: test
steps:
Expand Down
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,13 @@
},
"release": {
"branches": [
"main"
{
"name": "main"
},
{
"name": "beta",
"prerelease": true
}
],
"plugins": [
"@semantic-release/commit-analyzer",
Expand Down

0 comments on commit 51ab82d

Please sign in to comment.