Skip to content

Commit 2cffb0f

Browse files
committed
Update scripts
1 parent 94b9923 commit 2cffb0f

File tree

3 files changed

+19
-3
lines changed

3 files changed

+19
-3
lines changed

Diff for: .github/workflows/image-builder-from-repo.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
echo "image=$IMAGE" >> $GITHUB_OUTPUT
9494
9595
# artifact upload will take care of zipping for us
96-
- uses: actions/upload-artifact@v1
96+
- uses: actions/upload-artifact@v3
9797
with:
9898
name: ${{ steps.copy.outputs.image }}
9999
path: ${{ steps.copy.outputs.image }}.img

Diff for: .github/workflows/image-builder.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ jobs:
6565
echo 'set -x' >> start_chroot_script
6666
echo 'set -e' >> start_chroot_script
6767
echo 'source /common.sh' >> start_chroot_script
68+
echo 'type -p curl >/dev/null || apt install curl -y' >> start_chroot_script
69+
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
70+
echo '&& chmod go+r /usr/share/keyrings/hyperhdr.public.apt.gpg.key \' >> start_chroot_script
71+
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
6872
echo 'apt-get update' >> start_chroot_script
6973
echo 'cd /tmp' >> start_chroot_script
7074
echo 'wget ${{env.HYPERHDR_DEB}} -O hyperhdr.deb' >> start_chroot_script
@@ -94,7 +98,7 @@ jobs:
9498
echo "image=$IMAGE" >> $GITHUB_OUTPUT
9599
96100
# artifact upload will take care of zipping for us
97-
- uses: actions/upload-artifact@v1
101+
- uses: actions/upload-artifact@v3
98102
with:
99103
name: ${{ steps.copy.outputs.image }}
100104
path: ${{ steps.copy.outputs.image }}.img

Diff for: .github/workflows/push-master.yml

+13-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ jobs:
2828
linuxVersion: bullseye
2929
dockerName: Debian Bullseye (x86_64)
3030
platform: linux
31+
- dockerImage: x86_64
32+
linuxVersion: bookworm
33+
dockerName: Debian Bookworm (x86_64)
34+
platform: linux
3135
- dockerImage: x86_64
3236
linuxVersion: jammy
3337
dockerName: Ubuntu 22.04 LTS (x86_64)
@@ -39,7 +43,15 @@ jobs:
3943
- dockerImage: arm-64bit-aarch64
4044
linuxVersion: bullseye
4145
dockerName: Debian Bullseye (ARM 64-bit Raspberry Pi OS)
42-
platform: rpi
46+
platform: rpi
47+
- dockerImage: arm-32bit-armv6l
48+
linuxVersion: bookworm
49+
dockerName: Debian Bookworm (ARM 32-bit Raspberry Pi OS)
50+
platform: rpi
51+
- dockerImage: arm-64bit-aarch64
52+
linuxVersion: bookworm
53+
dockerName: Debian Bookworm (ARM 64-bit Raspberry Pi OS)
54+
platform: rpi
4355
- dockerImage: x86_64
4456
linuxVersion: ArchLinux
4557
dockerName: Arch Linux (x86_64)

0 commit comments

Comments
 (0)