Merge pull request #140 from garajonai/fix-ci

fix(ci/cd): release pipeline with fixed NEXT_RELEASE
garajonai · Mar 12, 2024 · ac33ea5 · ac33ea5
2 parents b24f5a1 + b7db7c6
commit ac33ea5
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   release:
-    if: ${{contains(github.head_ref, 'changelog') || github.event.label.name == 'pseudo-version' }}
+    if: ${{contains(github.head_ref, 'changelog') && github.event.pull_request.merged == true || github.event.label.name == 'pseudo-version' }}
     runs-on: ubuntu-latest
     steps:
       - name: Load secrets
@@ -47,8 +47,9 @@ jobs:
         run: make plugin
 
       - name: Release
-        if: ${{contains(github.head_ref, 'changelog') && github.event.pull_request.merged == true}}
-        run: make release
+        if: ${{contains(github.head_ref, 'changelog')}}
+        run: |
+          NEXT_RELEASE=$(git describe --tags --abbrev=0 2>/dev/null || echo v0.0.0)) make release
         env:
           GH_TOKEN: ${{ steps.botanibit.outputs.token }}