From f6fb4c6ea22169c8f00c5931680d1d075cf34c8d Mon Sep 17 00:00:00 2001 From: olegfomenko2002 Date: Thu, 23 Nov 2023 20:45:06 +0200 Subject: [PATCH] fixing ci rules for rc tag --- .github/workflows/packages-rc.yml | 10 ++++++++-- .github/workflows/packages.yml | 8 +++++++- .github/workflows/tag.yml | 2 +- README.md | 4 ++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/packages-rc.yml b/.github/workflows/packages-rc.yml index d9945f4a..990248fc 100644 --- a/.github/workflows/packages-rc.yml +++ b/.github/workflows/packages-rc.yml @@ -2,16 +2,22 @@ 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 jobs: goreleaser: - if: endsWith(github.ref, 'mainnet-beta') runs-on: ubuntu-latest steps: + - name: Check branch + if: endsWith(github.event.base_ref, 'mainnet-beta') == false + run: | + echo ${{ github.event.base_ref }} + echo ${{github.ref}} + exit -1 + - name: Checkout uses: actions/checkout@v4 with: diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml index c5493842..bbb3dd25 100644 --- a/.github/workflows/packages.yml +++ b/.github/workflows/packages.yml @@ -9,9 +9,15 @@ permissions: jobs: goreleaser: - if: endsWith(github.ref, 'mainnet') runs-on: ubuntu-latest steps: + - name: Check branch + if: endsWith(github.event.base_ref, 'mainnet') == false + run: | + echo ${{ github.event.base_ref }} + echo ${{github.ref}} + exit -1 + - name: Checkout uses: actions/checkout@v4 with: diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index b2696a41..259ca0d0 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -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: diff --git a/README.md b/README.md index 634ca000..7fe0254b 100644 --- a/README.md +++ b/README.md @@ -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