From e76035bcba15ce5c5638e86e814890c2b93b9644 Mon Sep 17 00:00:00 2001
From: judsonjames <judsonjames96@gmail.com>
Date: Tue, 9 Jan 2024 01:09:45 -0500
Subject: [PATCH] Testing ARM Runner with base commands

---
 .../workflows/orangepi-image-generation.yml   | 11 +++--
 scripts/generatePiImage.sh                    | 44 +++++++++----------
 2 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/orangepi-image-generation.yml b/.github/workflows/orangepi-image-generation.yml
index f584debb54..4ddffb87cc 100644
--- a/.github/workflows/orangepi-image-generation.yml
+++ b/.github/workflows/orangepi-image-generation.yml
@@ -294,10 +294,13 @@ jobs:
         with:
           name: jar-${{ matrix.artifact-name }}
       # TODO- replace with the arm-runner action and run this inside of the chroot. but this works for now.
-      - name: Generate image
-        run: |
-          chmod +x scripts/generatePiImage.sh
-          ./scripts/generatePiImage.sh ${{ matrix.image_url }} ${{ matrix.image_suffix }}
+      - uses: pguyot/arm-runner-action@v2
+        name: Generate image
+        with: 
+          base_image: ${{ matrix.image_url }}
+          commands: |
+            chmod +x scripts/generatePiImage.sh
+            ./scripts/generatePiImage.sh ${{ matrix.image_url }} ${{ matrix.image_suffix }}
       - uses: actions/upload-artifact@v4
         name: Upload image
         with:
diff --git a/scripts/generatePiImage.sh b/scripts/generatePiImage.sh
index 8050a30ead..d6ee8e507a 100755
--- a/scripts/generatePiImage.sh
+++ b/scripts/generatePiImage.sh
@@ -69,38 +69,38 @@ TMP=$(mktemp -d)
 LOOP=$(sudo losetup --show -fP "${IMAGE_FILE}")
 PARTITION="${LOOP}p2"
 
-echo "Confirming that loop partition exists"
-if ! lsblk | grep -q "$(basename $PARTITION)"; then
-    echo "Loop device was not found in lsblk output. Creating it now."
-    sudo parted $LOOP mklabel msdos
+# echo "Confirming that loop partition exists"
+# if ! lsblk | grep -q "$(basename $PARTITION)"; then
+#     echo "Loop device was not found in lsblk output. Creating it now."
+#     sudo parted $LOOP mklabel msdos
 
-    sudo parted $LOOP mkpart primary ext4 0% 50% > /dev/null 2>&1
-    sudo mkfs.ext4 "${LOOP}p1" > /dev/null 2>&1
+#     sudo parted $LOOP mkpart primary ext4 0% 50% > /dev/null 2>&1
+#     sudo mkfs.ext4 "${LOOP}p1" > /dev/null 2>&1
 
-    sudo parted $LOOP mkpart primary ext4 50% 100% > /dev/null 2>&1
-    sudo mkfs.ext4 $PARTITION > /dev/null 2>&1
+#     sudo parted $LOOP mkpart primary ext4 50% 100% > /dev/null 2>&1
+#     sudo mkfs.ext4 $PARTITION > /dev/null 2>&1
 
-    if ! lsblk | grep -q "$(basename $PARTITION)"; then
-        echo "Failed to create partition. Exiting."
-        exit 1
-    fi
+#     if ! lsblk | grep -q "$(basename $PARTITION)"; then
+#         echo "Failed to create partition. Exiting."
+#         exit 1
+#     fi
 
-    echo "Created loop device partition"
-fi
+#     echo "Created loop device partition"
+# fi
 
 echo "Image mounted! Copying jar..."
 sudo mount $PARTITION $TMP
 
 
-if ! command -v pushd > /dev/null 2>&1; then
-    echo "Overwriting pushd because it doesn't exist."
-    alias pushd='opi_pushd'
-fi
+# if ! command -v pushd > /dev/null 2>&1; then
+#     echo "Overwriting pushd because it doesn't exist."
+#     alias pushd='opi_pushd'
+# fi
 
-if ! command -v popd > /dev/null 2>&1; then
-    echo "Overwriting popd because it doesn't exist."
-    alias popd='opi_popd'
-fi
+# if ! command -v popd > /dev/null 2>&1; then
+#     echo "Overwriting popd because it doesn't exist."
+#     alias popd='opi_popd'
+# fi
 
 pushd .