build: update

Signed-off-by: AuxXxilium <info@auxxxilium.tech>

.github/workflows/autobuild.yml

@@ -73,7 +73,7 @@ jobs:
 
           echo "Create Arc Image"
           IMAGE_FILE="arc.img"
-          gzip -dc "files/grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
           fdisk -l "${IMAGE_FILE}"
           
           LOOPX=$(sudo losetup -f)
@@ -124,8 +124,8 @@ jobs:
 
       # Upload artifact
       - name: Upload
-        uses: actions/upload-artifact@v3
-        if: env.VERSION != ''
+        if: success() && env.VERSION == ''
+        uses: actions/upload-artifact@v4
         with:
           name: Images
           path: |
@@ -134,12 +134,13 @@ jobs:
 
       # Publish a release if is a tag
       - name: Release
-        uses: softprops/action-gh-release@v1
-        if: env.VERSION != ''
+        if: success() && env.VERSION != ''
+        uses: ncipollo/release-action@v1
         with:
-          tag_name: ${{ env.VERSION }}
+          tag: ${{ env.VERSION }}
           prerelease: true
-          files: |
+          allowUpdates: true
+          artifacts: |
             arc-${{ env.VERSION }}.img.zip
             arc-${{ env.VERSION }}.vmdk-dyn.zip
             arc-${{ env.VERSION }}.vmdk-flat.zip

.github/workflows/build.yml

@@ -145,7 +145,7 @@ jobs:
 
           echo "Create Arc Image"
           IMAGE_FILE="arc.img"
-          gzip -dc "files/grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
           fdisk -l "${IMAGE_FILE}"
           
           LOOPX=$(sudo losetup -f)
@@ -207,8 +207,8 @@ jobs:
 
       # Upload artifact
       - name: Upload
-        uses: actions/upload-artifact@v3
-        if: env.VERSION != ''
+        if: success() && env.VERSION == ''
+        uses: actions/upload-artifact@v4
         with:
           name: Images
           path: |
@@ -219,11 +219,12 @@ jobs:
 
       # Publish a release if is a tag
       - name: Release
-        uses: softprops/action-gh-release@v1
-        if: env.VERSION != ''
+        if: success() && env.VERSION != ''
+        uses: ncipollo/release-action@v1
         with:
-          tag_name: ${{ env.VERSION }}
+          tag: ${{ env.VERSION }}
           prerelease: ${{ inputs.prerelease }}
+          allowUpdates: true
           body: |
             Notice:
               ${{ inputs.notice }}
@@ -237,7 +238,7 @@ jobs:
 
             Changelog:
               ${{ steps.Changelog.outputs.changelog }}
-          files: |
+          artifacts: |
             arc-${{ env.VERSION }}.img.zip
             # arc_4GB-${{ env.VERSION }}.img.zip
             arc-${{ env.VERSION }}.vmdk-dyn.zip

.github/workflows/grub.yml

@@ -28,7 +28,8 @@ jobs:
           sudo timedatectl set-timezone "Europe/Berlin"
 
           sudo apt update
-          sudo apt install -y build-essential bison flex dosfstools gawk gettext pkg-config autoconf automake autopoint
+          sudo apt install -y autoconf automake autopoint gettext build-essential bison flex libtool dosfstools e2fsprogs
+          sudo apt install -y libfreetype6-dev unifont fonts-dejavu libfuse-dev liblzma-dev libzfslinux-dev
 
       - name: Make Grub
         run: |
@@ -46,7 +47,7 @@ jobs:
         run: |
           if [ -f "grub.img.gz" ]; then
             echo "Copy img ..."
-            mv -f grub.img.gz files/grub.img.gz
+            mv -f grub.img.gz files/initrd/opt/arc/grub.img.gz
 
             echo "Git push ..."
             git pull
@@ -58,4 +59,4 @@ jobs:
             fi
           else
             echo "No change ..."
-          fi
+          fi

files/initrd/opt/arc/arc-functions.sh

@@ -2061,7 +2061,7 @@ function cloneLoader() {
     rm -rf "${PART3_PATH}/dl"
     CLEARCACHE=0
 
-    gzip -dc "${CUSTOM_PATH}/grub.img.gz" | dd of="${resp}" bs=1M conv=fsync status=progress
+    gzip -dc "${ARC_PATH}/grub.img.gz" | dd of="${resp}" bs=1M conv=fsync status=progress
     hdparm -z "${resp}" # reset disk cache
     fdisk -l "${resp}"
     sleep 3

img-gen.sh

@@ -17,7 +17,7 @@ getConfigs "files/p3/configs"
 getPatches "files/p3/patches"
 
 IMAGE_FILE="arc.img"
-gzip -dc "files/grub.img.gz" >"${IMAGE_FILE}"
+gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
 LOOPX=$(sudo losetup -f)