Reusable workflow fixes (#57)

* Reusable workflow fixes * Newline
bitwarden · Dec 6, 2024 · 6e8a4ae · 6e8a4ae
1 parent 4c7f41c
commit 6e8a4ae
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 24 deletions.
diff --git a/.github/workflows/pack-and-release.yml b/.github/workflows/pack-and-release.yml
@@ -94,7 +94,6 @@ jobs:
     needs:
       - parse
       - pack
-      - publish
     steps:
       - name: Create GitHub Release
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
@@ -171,8 +170,11 @@ jobs:
               console.log(`Upload response: ${uploadResponse.status}`);
             }
 
-      - name: Bump version
-        uses: bitwarden/dotnet-extensions/.github/workflows/version-bump.yml@main
-        with:
-          package: ${{ needs.parse.outputs.package }}
-          type: ${{ inputs.prerelease && 'prerelease' || 'hotfix' }}
+  bump-version:
+    needs:
+      - create-release
+      - parse
+    uses: bitwarden/dotnet-extensions/.github/workflows/version-bump.yml@main
+    with:
+      package: ${{ needs.parse.outputs.package }}
+      type: ${{ inputs.prerelease && 'prerelease' || 'hotfix' }}
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -8,9 +8,6 @@ on:
 jobs:
   prerelease:
     name: Do prerelease
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Pack and release
-        uses: bitwarden/dotnet-extensions/.github/workflows/pack-and-release.yml@main
-        with:
-          prerelease: true
+    uses: bitwarden/dotnet-extensions/.github/workflows/pack-and-release.yml@main
+    with:
+      prerelease: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -6,9 +6,6 @@ on:
 jobs:
   release:
     name: Do release
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Pack and release
-        uses: bitwarden/dotnet-extensions/.github/workflows/pack-and-release.yml@main
-        with:
-          prerelease: false
+    uses: bitwarden/dotnet-extensions/.github/workflows/pack-and-release.yml@main
+    with:
+      prerelease: false
diff --git a/.github/workflows/start-release.yml b/.github/workflows/start-release.yml
@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
     inputs:
       package:
-        description: Which package to release
+        description: Package to release
         required: true
         type: choice
         options:
@@ -59,8 +59,9 @@ jobs:
 
             await exec.exec(`git push --set-upstream origin HEAD:${releaseCandidateBranch}`);
 
-      - name: Bump version
-        uses: bitwarden/dotnet-extensions/.github/workflows/version-bump.yml@main
-        with:
-          type: ga
-          package: ${{ inputs.package }}
+  bump-version:
+    name: Bump version
+    uses: bitwarden/dotnet-extensions/.github/workflows/version-bump.yml@main
+    with:
+      type: ga
+      package: ${{ inputs.package }}