Skip to content

Commit

Permalink
Merge branch 'next' into alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
derevnjuk committed Oct 2, 2023
2 parents aac50aa + 20652dd commit aee2960
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
env:
VERSION: ${{ github.event.release.tag_name }}
TARGET_REF: ${{ github.event.release.target_commitish }}
TAG: ${{ github.event.release.target_commitish == 'master' && 'latest' || 'next' }}

jobs:
install-deps:
Expand Down Expand Up @@ -147,6 +146,18 @@ jobs:
- name: Setup node
uses: ./.github/workflows/composite/npm

- name: Set TAG based on target_commitish
run: |
if [ "${{ github.event.release.target_commitish }}" == "next" ]; then
echo "TAG=next" >> $GITHUB_ENV
elif [ "${{ github.event.release.target_commitish }}" == "alpha" ]; then
echo "TAG=alpha" >> $GITHUB_ENV
elif [ "${{ github.event.release.target_commitish }}" == "master" ]; then
echo "TAG=latest" >> $GITHUB_ENV
else
exit 1
fi
- name: Set NPM distribution
run: npm pkg set brightCli.distribution=npm

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- master
- next
- alpha

jobs:
release:
Expand Down
7 changes: 6 additions & 1 deletion .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,12 @@
{
"name": "next",
"channel": "next",
"prerelease": "next"
"prerelease": true
},
{
"name": "alpha",
"channel": "alpha",
"prerelease": true
}
],
"ci": true
Expand Down

0 comments on commit aee2960

Please sign in to comment.