ci: Publishワークフローの修正 (#1223)

approvers · Dec 28, 2023 · 3d1579b · 3d1579b
1 parent 1039592
commit 3d1579b
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 8 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -20,6 +20,27 @@ on:
         required: true
         type: string
   workflow_dispatch:
+    inputs:
+      major:
+        description: Major version number
+        required: true
+        type: string
+      minor:
+        description: Minor version number
+        required: true
+        type: string
+      patch:
+        description: Patch version number
+        required: true
+        type: string
+      sha:
+        description: Git SHA
+        required: true
+        type: string
+
+permissions:
+  contents: read
+  packages: write
 
 jobs:
   publish:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,6 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       releases_created: ${{ steps.release.outputs.releases_created }}
+      major: ${{ steps.release.outputs['packages/bot--major'] }}
+      minor: ${{ steps.release.outputs['packages/bot--minor'] }}
+      patch: ${{ steps.release.outputs['packages/bot--patch'] }}
+      sha: ${{ steps.release.outputs['packages/bot--sha'] }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -28,11 +32,15 @@ jobs:
         with:
           token: ${{ steps.token.outputs.token }}
 
-      - name: Publish the Docker package
-        if: ${{ steps.release.outputs.releases_created == 'true' }}
-        uses: approvers/OreOreBot2/.github/workflows/publish.yml@main
-        with:
-          major: ${{ steps.release.outputs['packages/bot--major'] }}
-          minor: ${{ steps.release.outputs['packages/bot--minor'] }}
-          patch: ${{ steps.release.outputs['packages/bot--patch'] }}
-          sha: ${{ steps.release.outputs['packages/bot--sha'] }}
+  publish:
+    needs: release
+    if: ${{ needs.release.outputs.releases_created == 'true' }}
+    uses: ./.github/workflows/publish.yml
+    permissions:
+      contents: read
+      packages: write
+    with:
+      major: ${{ needs.release.outputs.major }}
+      minor: ${{ needs.release.outputs.minor }}
+      patch: ${{ needs.release.outputs.patch }}
+      sha: ${{ needs.release.outputs.sha }}