mod artifact

RROrg · May 5, 2023 · c8cf703 · c8cf703
1 parent ae0da07
commit c8cf703
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -160,24 +160,16 @@ jobs:
           qemu-img convert -O vmdk arpl.img arpl-dyn.vmdk
           qemu-img convert -O vmdk -o adapter_type=lsilogic arpl.img -o subformat=monolithicFlat arpl.vmdk
 
-          zip -9 "arpl-i18n.zip" arpl.img
-
-      # Upload artifact
-      - name: Upload
-        uses: actions/upload-artifact@v3
-        with:
-          name: Images
-          path: |
-            arpl-i18n.zip
-          retention-days: 5
-
       # Zip image and generate checksum
       - name: Pack
-        if: env.VERSION != ''
         run: |
-          zip -9 "arpl-i18n-${{ env.VERSION }}.img.zip" arpl.img
-          zip -9 "arpl-i18n-${{ env.VERSION }}.vmdk-dyn.zip" arpl-dyn.vmdk
-          zip -9 "arpl-i18n-${{ env.VERSION }}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk
+          if [ -n "${{ env.VERSION }}" ]; then
+            zip -9 "arpl-i18n-${{ env.VERSION }}.img.zip" arpl.img
+            zip -9 "arpl-i18n-${{ env.VERSION }}.vmdk-dyn.zip" arpl-dyn.vmdk
+            zip -9 "arpl-i18n-${{ env.VERSION }}.vmdk-flat.zip" arpl.vmdk arpl-flat.vmdk
+          else
+            zip -9 "arpl-i18n.img.zip" arpl.img
+          fi
           sha256sum update-list.yml update-check.sh > sha256sum
           zip -9j update.zip update-list.yml update-check.sh
           while read F; do
@@ -194,6 +186,16 @@ jobs:
           done < <(yq '.replace | explode(.) | to_entries | map([.key])[] | .[]' update-list.yml)
           zip -9j update.zip sha256sum 
 
+      # Upload artifact
+      - name: Upload
+        uses: actions/upload-artifact@v3
+        with:
+          name: Images
+          path: |
+            arpl-i18n.img.zip
+            update.zip
+          retention-days: 5
+
       # Publish a release if is a tag
       - name: Release
         uses: softprops/action-gh-release@v1

diff --git a/update-list.yml b/update-list.yml
@@ -1,5 +1,4 @@
 remove:
-  "files/board/arpl/p1/grub/"
 replace:
   ".buildroot/output/images/bzImage": "/mnt/p3/bzImage-arpl"
   ".buildroot/output/images/rootfs.cpio.xz": "/mnt/p3/initrd-arpl"