From a46b954adf997940be356934ce1174c801a96ec1 Mon Sep 17 00:00:00 2001 From: Vadzim Hushchanskou Date: Thu, 21 Nov 2024 17:00:16 +0300 Subject: [PATCH] Release workflow update --- .github/workflows/release.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index faac8e6..7eb7bbb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,9 +21,10 @@ on: - '.github/**' - README.md - README_TEMPLATE.md - - gradle.properties - CHANGELOG.md + workflow_dispatch: + env: VERSION_FILE: gradle.properties VERSION_EXTRACT_PATTERN: '(?<=version=).+' @@ -37,6 +38,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + with: + ref: 'master' + fetch-depth: 0 - name: Generate versions uses: HardNorth/github-version-generate@v1 @@ -96,7 +100,6 @@ jobs: body: ${{ steps.readChangelogEntry.outputs.changes }} - name: Checkout develop branch - if: ${{github.ref}} == 'master' uses: actions/checkout@v4 with: ref: 'develop' @@ -104,7 +107,6 @@ jobs: - name: Merge release branch into develop id: mergeIntoDevelop - if: ${{github.ref}} == 'master' run: | git merge -m 'Merge master branch into develop after a release' origin/master git status | (! grep -Fq 'both modified:') || git status | grep -F 'both modified:' \