From 061cc973f525492294e40e688f87e4e6c68f9632 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Fri, 5 Jan 2024 01:57:57 +0500
Subject: [PATCH] workflows

---
 .github/workflows/build.yml   | 8 ++++----
 .github/workflows/release.yml | 9 ++-------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 51f626a24..abcc32cf3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -256,7 +256,7 @@ jobs:
       - name: Upload zip cf
         uses: actions/upload-artifact@v4.0.0
         with:
-          name: modpack_cf
+          name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf
           path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-cf.zip
           retention-days: 5
 
@@ -296,7 +296,7 @@ jobs:
       - name: Upload zip mmc
         uses: actions/upload-artifact@v4.0.0
         with:
-          name: modpack_mmc
+          name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc
           path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-mmc.zip
           retention-days: 5
 
@@ -333,14 +333,14 @@ jobs:
       - name: Upload zip
         uses: actions/upload-artifact@v4.0.0
         with:
-          name: server_pack
+          name: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server
           path: ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip
           retention-days: 5
 
   release:
     name: Release
     needs: [modpack-info, build-cf-modpack, build-mmc-modpack, build-serverpack]
-    if: startsWith(github.ref, 'refs/tags/')
+    #if: startsWith(github.ref, 'refs/tags/')
     uses: ./.github/workflows/release.yml
     with:
       project_name: ${{ needs.modpack-info.outputs.project_name }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d75ff7449..a64f0400c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,11 +36,6 @@ jobs:
           pattern: ${{ inputs.project_name }}-${{ inputs.project_version }}-*
           merge-multiple: true
 
-      - name: Download changelog
-        uses: actions/download-artifact@v4.1.0
-        with:
-          name: changelog
-
       # - name: Create release
       #   uses: softprops/action-gh-release@v1
       #   with:
@@ -70,12 +65,12 @@ jobs:
       - name: Download modpack
         uses: actions/download-artifact@v4.1.0
         with:
-          name: modpack_cf
+          name: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf
 
       - name: Download serverpack
         uses: actions/download-artifact@v4.1.0
         with:
-          name: server_pack
+          name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server
 
       # - name: Upload Curseforge
       #   id: cf_release