Rework zip creation for release

sailfish-on-dontbeevil · Feb 2, 2022 · 4c57959 · 4c57959
1 parent 4882aa9
commit 4c57959
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Install required dependencies
       run: |
         apt update
-        apt install -y unzip flex bc bison kmod cpio libssl-dev device-tree-compiler python3 python3-dev swig u-boot-tools python3-distutils python3-setuptools
+        apt install -y zip unzip flex bc bison kmod cpio libssl-dev device-tree-compiler python3 python3-dev swig u-boot-tools python3-distutils python3-setuptools
 
     - name: Install arm compiler
       run: |
@@ -64,18 +64,9 @@ jobs:
         mkimage -C none -A arm -T script -d ./pinetab/boot.cmd ./pinetab/boot.scr
         mkimage -C none -A arm -T script -d ./pinephone-pro/boot.cmd ./pinephone-pro/boot.scr
 
-    - name: Upload a Build Artifact
-      id: upload_artifact
-      uses: actions/upload-artifact@v2
-      with:
-        # Artifact name
-        name: u-boot-pinephone-${{ github.sha }}
-        # A file, directory or wildcard pattern that describes what to upload
-        path: |
-          ./*/*.bin
-          ./*/*.scr
-          ./*/*.itb
-          ./*/*.img
+    - name: Create artifact
+      run: |
+        zip  -r u-boot-pinephone.zip ./ -i \*.img -i \*.itb -i \*.scr -i \*.bin
 
     - name: Create Release
       id: create_release
@@ -95,7 +86,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./u-boot-pinephone-${{ github.sha }}.zip
-        asset_name: u-boot-pinephone-${{ github.sha }}
+        asset_path: ./u-boot-pinephone.zip
+        asset_name: u-boot-pinephone
         asset_content_type: application/zip