ci: Refactor release workflow & add version in name

TriliumNext · Sep 6, 2024 · e4d6ab3 · e4d6ab3
1 parent c964f9e
commit e4d6ab3
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,35 +48,24 @@ jobs:
         run: |
           mkdir -p upload
           file=$(find out/make -name '*.zip' -print -quit)
-          cp "$file" "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-${{ github.ref_name }}.zip"
+          cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.zip"
           file=$(find out/make -name '*.${{ matrix.os.extension }}' -print -quit)
-          cp "$file" "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-${{ github.ref_name }}.${{ matrix.os.extension }}"
+          cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }}"
       - name: Prepare artifacts (Windows)
         if: runner.os == 'windows'
         run: |
           mkdir upload
           $file = Get-ChildItem -Path out/make -Filter '*.zip' -Recurse | Select-Object -First 1
-          Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-${{ github.ref_name }}.zip"
+          Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.zip"
           $file = Get-ChildItem -Path out/make -Filter '*.${{ matrix.os.extension }}' -Recurse | Select-Object -First 1
-          Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ matrix.os.name }}-${{ matrix.arch }}-${{ github.ref_name }}.${{ matrix.os.extension }}"
-      - name: Publish artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}.zip
-          path: upload/*.zip
-      - name: Rename the output artifact
-        run: |
-          mv upload/*.${{ matrix.os.extension }} "upload/TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}.${{matrix.os.extension}}"
-          mv upload/*.zip "upload/TriliumNextNotes ${{ matrix.os.name }} ${{ matrix.arch }}.zip"
+          Copy-Item -Path $file.FullName -Destination "upload/TriliumNextNotes-${{ github.ref_name }}-${{ matrix.os.name }}-${{ matrix.arch }}.${{ matrix.os.extension }}"      
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:
           draft: true
           tag_name: test_release
           fail_on_unmatched_files: true
-          files: |
-            upload/*.${{matrix.os.extension}}
-            upload/*.zip
+          files: upload/*.*
   build_linux_server-x64:
     name: Build Linux Server x86_64
     runs-on: ubuntu-latest
@@ -98,12 +87,11 @@ jobs:
         run: |
           mkdir -p upload
           file=$(find dist -name '*.tar.xz' -print -quit)
-          cp "$file" "upload/TriliumNextNotes-linux-x64-${{ github.ref_name }}.tar.xz"
+          cp "$file" "upload/TriliumNextNotes-${{ github.ref_name }}-linux-x64.tar.xz"
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:
           draft: true
           tag_name: test_release
           fail_on_unmatched_files: true
-          files: |
-            upload/*.xz
+          files: upload/*.*