Update bump-version.yml

cewert · Feb 11, 2024 · f936db4 · f936db4
1 parent fb405e2
commit f936db4
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml
@@ -21,7 +21,6 @@ on:
 
 jobs:
   build:
-    needs: prep
     if: ${{ github.event.inputs.versionType == 'build' }}
     runs-on: ubuntu-latest
     steps:
@@ -78,7 +77,6 @@ jobs:
           git push --set-upstream origin "${{ env.newBranch }}"
           gh pr create --title "Bump ${{ github.event.inputs.targetBranch }} branch to ${{ env.newVersion }}" --body "Bump version to prep for next release." --label ignore-changelog --base ${{ env.targetBranch }} 
   minor:
-    needs: prep
     if: ${{ github.event.inputs.versionType == 'minor' }}
     runs-on: ubuntu-latest
     steps:
@@ -94,7 +92,7 @@ jobs:
         run: echo "targetBranch=${{ github.event.inputs.targetBranch }}" >> $GITHUB_ENV
       - name: Update targetBranch with actual bugfix branch name
         if: github.event.inputs.targetBranch == 'bugfix'
-        run: echo "targetBranch=${{ needs.prep.outputs.bugBranch }}" >> $GITHUB_ENV
+        run: echo "targetBranch=$(git branch --list *.*.z)" >> $GITHUB_ENV
       # Save old version
       - name: Find and save old major_version from manifest
         run: awk 'BEGIN { FS="=" } /^major_version/ { print "oldMajor="$2; }' manifest >> $GITHUB_ENV
@@ -138,7 +136,6 @@ jobs:
           gh pr create --title "Bump ${{ github.event.inputs.targetBranch }} branch to ${{ env.newVersion }}" --body "Bump version to prep for next release." --label ignore-changelog --base ${{ env.targetBranch  }} 
       
   major:
-    needs: prep
     if: ${{ github.event.inputs.versionType == 'major' }}
     runs-on: ubuntu-latest
     steps:
@@ -154,7 +151,7 @@ jobs:
         run: echo "targetBranch=${{ github.event.inputs.targetBranch }}" >> $GITHUB_ENV
       - name: Update targetBranch with actual bugfix branch name
         if: github.event.inputs.targetBranch == 'bugfix'
-        run: echo "targetBranch=${{ needs.prep.outputs.bugBranch }}" >> $GITHUB_ENV
+        run: echo "targetBranch=$(git branch --list *.*.z)" >> $GITHUB_ENV
       # Save old version
       - name: Find and save old major_version from manifest
         run: awk 'BEGIN { FS="=" } /^major_version/ { print "oldMajor="$2; }' manifest >> $GITHUB_ENV