Rename all the things

mjonuschat · Mar 5, 2024 · 7c7814b · 7c7814b
1 parent 11d079b
commit 7c7814b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/build_prusa.yml b/.github/workflows/build_prusa.yml
@@ -149,13 +149,20 @@ jobs:
         shell: bash
         run: |
           ./build_release_linux.sh -isr
-          ls -laR ./build
+          mv -n ./build/PrusaSlicer-${{ env.ver_pure }}+Linux.tar ./build/PrusaSlicer-${{ env.ver }}+Linux-${{ env.date }}.tar
           mv -n ./build/PrusaSlicer-${{ env.ver_pure }}+Linux.AppImage ./build/PrusaSlicer-${{ env.ver }}+Linux-${{ env.date }}.AppImage
           chmod +x ./build/PrusaSlicer-${{ env.ver }}+Linux-${{ env.date }}.AppImage
 
-      - name: Upload artifacts Ubuntu
+      - name: Upload artifacts Ubuntu (Archive)
         if: inputs.os == 'ubuntu-22.04'
         uses: actions/upload-artifact@v4
         with:
-          name: PrusaSlicer-${{ env.ver }}+Linux-${{ env.date }}
+          name: "PrusaSlicer-${{ env.ver }}+Linux-${{ env.date }} (Archive)"
+          path: './build/PrusaSlicer-${{ env.ver }}+Linux-${{ env.date }}.AppImage'
+
+      - name: Upload artifacts Ubuntu (AppImage)
+        if: inputs.os == 'ubuntu-22.04'
+        uses: actions/upload-artifact@v4
+        with:
+          name: "PrusaSlicer-${{ env.ver }}+Linux-${{ env.date }} (AppImage)"
           path: './build/PrusaSlicer-${{ env.ver }}+Linux-${{ env.date }}.AppImage'
diff --git a/src/platform/unix/build_linux_image.sh.in b/src/platform/unix/build_linux_image.sh.in
@@ -52,7 +52,7 @@ EOF
     cp -f @SLIC3R_APP_CMD@ package/@SLIC3R_APP_CMD@
     cp -f @SLIC3R_VIEWER_CMD@ package/@SLIC3R_VIEWER_CMD@
     pushd package
-    tar -cvf ../@SLIC3R_APP_KEY@.tar .  &>/dev/null
+    tar -cvf ../@SLIC3R_APP_KEY@-@SLIC3R_VERSION@+Linux.tar .  &>/dev/null
     popd
 #} &> $ROOT/Build.log # Capture all command output
 echo "done"