Update scripts

awawa-dev · Aug 3, 2023 · 2cffb0f · 2cffb0f
1 parent 94b9923
commit 2cffb0f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/image-builder-from-repo.yml b/.github/workflows/image-builder-from-repo.yml
@@ -93,7 +93,7 @@ jobs:
         echo "image=$IMAGE" >> $GITHUB_OUTPUT
 
     # artifact upload will take care of zipping for us
-    - uses: actions/upload-artifact@v1      
+    - uses: actions/upload-artifact@v3
       with:
         name: ${{ steps.copy.outputs.image }}
         path: ${{ steps.copy.outputs.image }}.img
diff --git a/.github/workflows/image-builder.yml b/.github/workflows/image-builder.yml
@@ -65,6 +65,10 @@ jobs:
         echo 'set -x' >> start_chroot_script
         echo 'set -e' >> start_chroot_script
         echo 'source /common.sh' >> start_chroot_script
+        echo 'type -p curl >/dev/null || apt install curl -y' >> start_chroot_script
+        echo 'curl -fsSL https://awawa-dev.github.io/hyperhdr.public.apt.gpg.key | dd of=/usr/share/keyrings/hyperhdr.public.apt.gpg.key \' >> start_chroot_script
+        echo '&& chmod go+r /usr/share/keyrings/hyperhdr.public.apt.gpg.key \' >> start_chroot_script
+        echo '&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/hyperhdr.public.apt.gpg.key] https://awawa-dev.github.io $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/hyperhdr.list > /dev/null \' >> start_chroot_script
         echo 'apt-get update' >> start_chroot_script
         echo 'cd /tmp' >> start_chroot_script
         echo 'wget ${{env.HYPERHDR_DEB}} -O hyperhdr.deb' >> start_chroot_script
@@ -94,7 +98,7 @@ jobs:
         echo "image=$IMAGE" >> $GITHUB_OUTPUT
 
     # artifact upload will take care of zipping for us
-    - uses: actions/upload-artifact@v1      
+    - uses: actions/upload-artifact@v3
       with:
         name: ${{ steps.copy.outputs.image }}
         path: ${{ steps.copy.outputs.image }}.img
diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
@@ -28,6 +28,10 @@ jobs:
             linuxVersion: bullseye
             dockerName: Debian Bullseye (x86_64)
             platform: linux
+          - dockerImage: x86_64
+            linuxVersion: bookworm
+            dockerName: Debian Bookworm (x86_64)
+            platform: linux
           - dockerImage: x86_64
             linuxVersion: jammy
             dockerName: Ubuntu 22.04 LTS (x86_64)
@@ -39,7 +43,15 @@ jobs:
           - dockerImage: arm-64bit-aarch64
             linuxVersion: bullseye
             dockerName: Debian Bullseye (ARM 64-bit Raspberry Pi OS)
-            platform: rpi            
+            platform: rpi
+          - dockerImage: arm-32bit-armv6l
+            linuxVersion: bookworm
+            dockerName: Debian Bookworm (ARM 32-bit Raspberry Pi OS)
+            platform: rpi
+          - dockerImage: arm-64bit-aarch64
+            linuxVersion: bookworm
+            dockerName: Debian Bookworm (ARM 64-bit Raspberry Pi OS)
+            platform: rpi              
           - dockerImage: x86_64
             linuxVersion: ArchLinux
             dockerName: Arch Linux (x86_64)