Skip to content

Commit

Permalink
Merge branch 'update/v1.1.0' into chains/mainnet-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
olegfomenko committed Nov 23, 2023
2 parents 0451dd9 + f6fb4c6 commit 630c3d3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/packages-rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build Rarimo Core executables
on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+.rc-[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+'

permissions:
contents: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
push:
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+.rc-[0-9]+'
- 'v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+'

jobs:
converge:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ Rarimo core leverages on the following branches:
- `mainnet-beta` branch with testnet core with all testnet upgrades
- `mainnet` branch with mainnet core with all mainnet upgrades

For the tags we are using an approach when stable releases with `vx.x.x` tag has only the `mainnet` core. On the other
side `mainnet-beta` releases are build under `vx.x.x.rc-x` tag. For the master branch releases only hash tagged images
For the tags we are using an approach when stable releases with `vX.X.X` tag has only the `mainnet` core. On the other
side `mainnet-beta` releases are build under `vX.X.X-rcX` tag. For the master branch releases only hash tagged images
will be provided.

Before creating the `mainnet` release be sure that it includes all unreleased changes from `mainnet-beta` and then
Expand Down

0 comments on commit 630c3d3

Please sign in to comment.