build: update release workflows

mob-sakai · Nov 20, 2023 · b0ca7da · b0ca7da
1 parent 563142f
commit b0ca7da
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,6 +22,8 @@ jobs:
       channel: ${{ steps.release.outputs.new_release_channel }}
       released: ${{ steps.release.outputs.new_release_published }}
       tag: ${{ steps.release.outputs.new_release_git_tag }}
+      version: ${{ steps.release.outputs.new_release_version }}
+      notes: ${{ steps.release.outputs.new_release_notes }}
     steps:
       - name: 🚚 Checkout (${{ github.ref_name }})
         uses: actions/checkout@v4
@@ -39,8 +41,10 @@ jobs:
 
       - run: |
           echo "🔖 New release published: '${{ steps.release.outputs.new_release_published }}'" | tee -a $GITHUB_STEP_SUMMARY
+          echo "🔖 New release version: '${{ steps.release.outputs.new_release_version }}'" | tee -a $GITHUB_STEP_SUMMARY
           echo "🔖 New release channel: '${{ steps.release.outputs.new_release_channel }}'" | tee -a $GITHUB_STEP_SUMMARY
           echo "🔖 New release git tag: '${{ steps.release.outputs.new_release_git_tag }}'" | tee -a $GITHUB_STEP_SUMMARY
+          echo '${{ steps.release.outputs.new_release_notes }}' | tee -a $GITHUB_STEP_SUMMARY
 
   merge-to-develop:
     name: 🔀 Merge to develop
@@ -60,7 +64,9 @@ jobs:
     uses: ./.github/workflows/snapshot.yml
     with:
       from: ${{ needs.release.outputs.tag }}
-      to: main_sandbox
+      to: main
       path: Packages/src
+      tag: ${{ needs.release.outputs.version }}
+      message: "chore(release): ${{ needs.release.outputs.version }} [skip ci]"
     permissions:
       contents: write
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -9,6 +9,10 @@ on:
         required: true
       path:
         required: true
+      message:
+        required: true
+      tag:
+        required: true
   workflow_call:
     inputs:
       from:
@@ -20,6 +24,12 @@ on:
       path:
         required: true
         type: string
+      message:
+        required: true
+        type: string
+      tag:
+        required: true
+        type: string
 
 jobs:
   merge:
@@ -51,5 +61,7 @@ jobs:
           git config --local user.name "github-actions[bot]"
 
           git add -A
-          git commit -m "📷 Snapshot '${{ inputs.path }}' from '${{ inputs.from }}' to '${{ inputs.to }}'"
+          git commit -m "${{ inputs.message }}"
+          git tag ${{ inputs.tag }}
           git push origin ${{ inputs.to }}
+          git push origin ${{ inputs.tag }}
diff --git a/Packages/src/.releaserc.json b/Packages/src/.releaserc.json
@@ -1,14 +1,13 @@
 {
   "branches": [
     "+([0-9])?(.{+([0-9]),x}).x",
-    "master",
+    "release",
     "main",
     {
       "name": "preview",
       "prerelease": true
     }
   ],
-  "tagFormat": "${version}",
   "plugins": [
     "@semantic-release/commit-analyzer",
     "@semantic-release/release-notes-generator",