add processing for tar files

Author: crschardt

.github/workflows/test-raspi.yml

@@ -1,10 +1,10 @@
 name: 'Test modifying a Raspberry Pi image'
 on:
-  push:
-    branches:
-      - 'main'
-      - 'releases/**'
-  pull_request:
+  # push:
+  #   branches:
+  #     - 'main'
+  #     - 'releases/**'
+  # pull_request:
   workflow_dispatch:
 
 jobs:

.github/workflows/test-rubikpi.yml

@@ -27,16 +27,22 @@ jobs:
       - name: Compress image
         run: |
             imagedir=$(dirname ${{ steps.build_image.outputs.image }})
-            tardir=${RUNNER_TEMP}/photonvision_rubikpi3
+            tardir=./photonvision_rubikpi3
             mkdir --parents ${tardir}
-            if ls ${imagedir}*.tar.gz 1>/dev/null 2>&1; then
-              sudo tar -xzf ${imagedir}*.tar.gz -C ${tardir}
+            echo "Contents of imagedir: ${imagedir}"
+            ls -la ${imagedir}
+            if ls ${imagedir}/*.tar.gz 1>/dev/null 2>&1; then
+              sudo tar -xzf ${imagedir}/*.tar.gz -C ${tardir} --strip-components=1
             fi
             sudo mv ${imagedir}/rawprogram*.xml ${tardir}/ 2>/dev/null || true
             sudo mv ${imagedir}/dtb.bin ${tardir}/ 2>/dev/null || true
             sudo mv ${imagedir}/*.img ${tardir}/ 2>/dev/null || true
+            echo "Before cleanup contents of tardir: ${tardir}"
+            ls -la ${tardir}
             sudo find ${tardir} -mindepth 2 -type f -exec mv {} ${tardir}/ \;
             sudo find ${tardir} -mindepth 1 -type d -empty -delete
+            echo "After cleanup contents of tardir: ${tardir}"
+            ls -la ${tardir}
             sudo tar -I 'xz -T0' -cf ./photonvision_rubikpi3.tar.xz ${tardir} --checkpoint=10000 --checkpoint-action=echo='%T'
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/test-tar.yml

@@ -0,0 +1,48 @@
+name: 'Test modifying a Rubik Pi tar image'
+on:
+  push:
+    branches:
+      - 'main'
+      - 'releases/**'
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/checkout@v4
+      - uses: ./
+        with:
+          image_url: https://github.com/PhotonVision/photon-image-modifier/releases/download/Dev/photonvision_rubikpi3.tar.xz
+          minimum_free_mb: 2000
+          root_location: "offset=569376768"
+          shrink_image: "no"
+          commands: |
+              echo "Testing Rubik Pi tar image"
+              uname -a
+              lsblk
+              echo "${loopdev}"
+        id: build_image
+      - name: Compress image
+        run: |
+            imagedir=$(dirname ${{ steps.build_image.outputs.image }})
+            echo "Imagedir: ${imagedir}"
+            ls -la ${imagedir}
+            tardir=./photonvision_rubikpi3
+            mkdir --parents ${tardir}
+            echo "Tardir: ${tardir}"
+            ls -la ${tardir}
+            sudo mv ${imagedir}/* ${tardir}/
+            echo "After move"
+            ls -la ${tardir}
+            sudo tar -I 'xz -T0' -cf ./photonvision_rubikpi3.tar.xz ${tardir} --checkpoint=10000 --checkpoint-action=echo='%T'
+      - uses: actions/upload-artifact@v4
+        with:
+          name: photonvision_rubikpi3.tar.xz
+          path: ./photonvision_rubikpi3.tar.xz
+          compression-level: 0
+          if-no-files-found: error
+          retention-days: 1
+
+

action.yml

@@ -61,6 +61,7 @@ runs:
 
           cat >> "${scriptdir}/commands.sh" << EOF
           #!/bin/bash
+          set -x
           # set -exo pipefail
           # export SHELLOPTS
           # export BASHOPTS

get_image.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -euo pipefail
+set -euxo pipefail
 
 url=$1
 download_path="${RUNNER_TEMP}/image"
@@ -30,16 +30,23 @@ else
 fi
 
 echo "Image: ${image}"
-
-ls -l ${download_path}
+ls -la ${download_path}
 
 if [[ ${image} = *.xz ]]; then
     echo "Unzipping ${image}"
     unxz ${image}
     image=${image%.xz}
 fi
 
-ls -l ${download_path}
+if [[ ${image} = *.tar ]]; then
+    echo "Untarring ${image}"
+    tar -xf ${image}
+    rm ${image}
+    image=$(find . -type f \( -name '*.img' \) -exec ls -s {} + 2>/dev/null | sort -rn | head -n1 | awk '{print $2}')
+fi
+
+echo "Image: ${image}"
+ls -la $(dirname ${image})
 
 if [[ ${image} != *.img ]]; then
     echo "${image} isn't a valid image file"