Skip to content

Commit

Permalink
feat: update release flow branches
Browse files Browse the repository at this point in the history
This commit updates the CI, so that dev is used as the default branch
  • Loading branch information
kyranjamie committed Oct 28, 2021
1 parent 3198e79 commit ee594d3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/create-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- 'main'
- 'beta'
- 'dev'
tags-ignore:
- '**'
paths-ignore:
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/publish-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ jobs:

outputs:
release_upload_url: ${{ steps.create_release.outputs.upload_url }}
new_version: ${{ steps.extract_version.outputs.version }}

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -165,7 +166,7 @@ jobs:
tag_name: v${{ steps.extract_version.outputs.version }}
release_name: Hiro Wallet v${{ steps.extract_version.outputs.version }}
draft: false
prerelease: ${{ contains(steps.extract_version.outputs.version, 'beta') }}
prerelease: ${{ contains(steps.extract_version.outputs.version, 'dev') }}
body_path: release-body.txt

upload-release-assets:
Expand Down Expand Up @@ -204,14 +205,14 @@ jobs:
with:
upload_url: ${{ needs.create-release.outputs.release_upload_url }}
asset_path: release/stacks-wallet-${{ matrix.stx_network }}-${{ matrix.os }}/stacks-wallet.${{ matrix.stx_network }}.${{ matrix.ext }}
asset_name: stacks-wallet.${{ matrix.stx_network }}.v${{ needs.build.outputs.version }}.${{ matrix.ext }}
asset_name: stacks-wallet.${{ matrix.stx_network }}.v${{ needs.create-release.outputs.new_version }}.${{ matrix.ext }}
asset_content_type: application/octet-stream

announce-release:
runs-on: ubuntu-latest

needs:
- build
- create-release
- upload-release-assets

steps:
Expand All @@ -221,4 +222,4 @@ jobs:
uses: Ilshidur/action-discord@master
with:
args: |
🔔 New Hiro Wallet released: [Download `v${{ needs.build.outputs.version }}` here](https://github.com/${{ github.repository }}/releases/tag/v${{ needs.build.outputs.version }})
🔔 New Hiro Wallet released: [Download `v${{ needs.create-release.outputs.new_version }}` here](https://github.com/${{ github.repository }}/releases/tag/v${{ needs.create-release.outputs.new_version }})
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

![GitHub Workflow Status](https://img.shields.io/github/workflow/status/blockstack/stacks-wallet/Build)
[![coverage](https://raw.githubusercontent.com/blockstack/stacks-wallet/gh-pages/badge.svg)](https://blockstack.github.io/stacks-wallet/)
[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/blockstack/stacks-wallet)](https://github.com/blockstack/stacks-wallet/releases/latest)

[![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/blockstack/stacks-wallet)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"channel": "3.x"
},
{
"name": "beta",
"name": "dev",
"prerelease": true
},
"main"
Expand Down

0 comments on commit ee594d3

Please sign in to comment.