chore: optimize hotfix-release.yml and release-changelog.yml

VisActor · Dec 27, 2023 · 9139c63 · 9139c63
1 parent 1ef4a99
commit 9139c63
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/hotfix-release.yml b/.github/workflows/hotfix-release.yml
@@ -100,7 +100,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag: v${{ steps.package-version.outputs.current_version }}
-          commit: main
+          commit: ${{ github.ref_name }}
           prerelease: false
           body: |
             ${{ steps.changelog.outputs.markdown }}

diff --git a/.github/workflows/release-changelog.yml b/.github/workflows/release-changelog.yml
@@ -32,6 +32,14 @@ jobs:
       - name: Install rush
         run: node common/scripts/install-run-rush.js install --bypass-policy
 
+      - name: Create branch
+        run: |
+          git status
+          git fetch origin develop:develop
+          git checkout develop
+          git status
+          git checkout -b docs/generate-changelog-${{  github.event.release.tag_name }}
+
       - name: generate changelog
         id: generate-changelog
         uses: xile611/collect-release-changelog@main
@@ -42,11 +50,8 @@ jobs:
           tag_name: ${{github.event.release.tag_name}}
           file_name: changelog.md
 
-      - name: Create branch
+      - name: Push branch
         run: |
-          git status
-          git checkout -b docs/generate-changelog-${{  github.event.release.tag_name }}
-          # Make any necessary changes
           git add .
           git commit -m "docs: generate changelog of release ${{  github.event.release.tag_name }}" -n
           git push origin docs/generate-changelog-${{  github.event.release.tag_name }}