Skip to content

Commit 2871006

Browse files
committed
ci: dietpi-software test: add debug code
1 parent 0d85584 commit 2871006

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

.github/workflows/dietpi-software.bash

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ fi
575575
G_EXEC sed --follow-symlinks -i '/# Start DietPi-Software/a\sed -i '\''/# Custom 1st run script/a\\for i in "${aSTART_SERVICES[@]}"; do G_EXEC_NOHALT=1 G_EXEC systemctl start "$i"; done'\'' /boot/dietpi/dietpi-software' rootfs/boot/dietpi/dietpi-login
576576
delay=10
577577
for i in "${aDELAY[@]}"; do (( $i > $delay )) && delay=$i; done
578-
G_EXEC eval "echo -e '#!/bin/dash\nexit_code=0; /boot/dietpi/dietpi-services start || exit_code=1; echo Waiting $delay seconds for service starts; sleep $delay' > rootfs/boot/Automation_Custom_Script.sh"
578+
G_EXEC eval "echo -e '#!/bin/bash\nexit_code=0; /boot/dietpi/dietpi-services start || exit_code=1; echo Waiting $delay seconds for service starts; sleep $delay' > rootfs/boot/Automation_Custom_Script.sh"
579579
# - Loop through software IDs to test
580580
printf '%s\n' "${!aSERVICES[@]}" "${!aTCP[@]}" "${!aUDP[@]}" "${!aCOMMANDS[@]}" | sort -u | while read -r i
581581
do
@@ -619,6 +619,33 @@ G_EXEC eval 'echo '\''[ $exit_code = 0 ] && > /success || { journalctl -n 50; ss
619619
# Shutdown as well on failures before the custom script is executed
620620
G_EXEC sed --follow-symlinks -i 's|Prompt_on_Failure$|{ journalctl -n 50; ss -tulpn; df -h; free -h; systemctl start poweroff.target; exit 1; }|' rootfs/boot/dietpi/dietpi-login
621621

622+
# DEBUG
623+
#G_EXEC sed --follow-symlinks -i '/#G_INIT$/i\G_AGUP' rootfs/boot/dietpi/dietpi-login
624+
#G_EXEC sed --follow-symlinks -i '\|/boot/dietpi/dietpi-software|i\G_THREAD_START curl -vsSfL https://dietpi.com/downloads/binaries/rpi/dxx-rebirth.7z -o gogs_armv6l.7z' rootfs/boot/dietpi/dietpi-login
625+
#G_EXEC sed --follow-symlinks -i '\|/boot/dietpi/dietpi-software|i\G_THREAD_START curl -vsSfL --http1.1 https://dietpi.com/downloads/binaries/rpi/dxx-rebirth.7z -o gogs_armv6l.7z' rootfs/boot/dietpi/dietpi-login
626+
#G_EXEC sed --follow-symlinks -i '\|/boot/dietpi/dietpi-software|i\G_THREAD_START curl -vsSfL --http3-only https://dietpi.com/downloads/binaries/rpi/dxx-rebirth.7z -o gogs_armv6l.7z' rootfs/boot/dietpi/dietpi-login
627+
#G_EXEC sed --follow-symlinks -i '\|/boot/dietpi/dietpi-software|i\G_AGI 7zip' rootfs/boot/dietpi/dietpi-login
628+
#G_EXEC sed --follow-symlinks -i '\|/boot/dietpi/dietpi-software|i\G_THREAD_WAIT' rootfs/boot/dietpi/dietpi-login
629+
#G_EXEC sed --follow-symlinks -i '\|/boot/dietpi/dietpi-software|i\poweroff' rootfs/boot/dietpi/dietpi-login
630+
631+
#G_EXEC sed --follow-symlinks -i '\|poweroff.target|i\source /boot/dietpi/func/dietpi-globals' rootfs/boot/Automation_Custom_Script.sh
632+
#G_EXEC sed --follow-symlinks -i '\|poweroff.target|i\G_THREAD_START curl -vsSfL https://download.roonlabs.net/builds/RoonBridge_linuxx64.tar.bz2 -o gogs_armv6l.7z' rootfs/boot/Automation_Custom_Script.sh
633+
#G_EXEC sed --follow-symlinks -i '\|poweroff.target|i\G_THREAD_START curl -vsSfL --http1.1 https://download.roonlabs.net/builds/RoonBridge_linuxx64.tar.bz2 -o gogs_armv6l.7z' rootfs/boot/Automation_Custom_Script.sh
634+
#G_EXEC sed --follow-symlinks -i '\|poweroff.target|i\G_THREAD_START curl -vsSfL --http3-only https://download.roonlabs.net/builds/RoonBridge_linuxx64.tar.bz2 -o gogs_armv6l.7z' rootfs/boot/Automation_Custom_Script.sh
635+
#G_EXEC sed --follow-symlinks -i '\|poweroff.target|i\G_AGI 7zip' rootfs/boot/Automation_Custom_Script.sh
636+
#G_EXEC sed --follow-symlinks -i '\|poweroff.target|i\G_THREAD_WAIT' rootfs/boot/Automation_Custom_Script.sh
637+
638+
#G_EXEC sed --follow-symlinks -i '/# Start DietPi-Software/i\sed -i '\''/# Custom 1st run script/i\\G_THREAD_START curl -sSfL https://dietpi.com/downloads/binaries/trixie/gogs_armv7l.7z -o gogs_armv6l.7z'\'' /boot/dietpi/dietpi-software' rootfs/boot/dietpi/dietpi-login
639+
#G_EXEC sed --follow-symlinks -i '/# Start DietPi-Software/i\sed -i '\''/# Custom 1st run script/i\\G_THREAD_START curl -vsSfL --http1.1 https://dietpi.com/downloads/binaries/trixie/gogs_armv7l.7z -o gogs_armv6l.7z'\'' /boot/dietpi/dietpi-software' rootfs/boot/dietpi/dietpi-login
640+
#G_EXEC sed --follow-symlinks -i '/# Start DietPi-Software/i\sed -i '\''/# Custom 1st run script/i\\G_THREAD_START curl -vsSfL --http3-only https://dietpi.com/downloads/binaries/trixie/gogs_armv7l.7z -o gogs_armv6l.7z'\'' /boot/dietpi/dietpi-software' rootfs/boot/dietpi/dietpi-login
641+
#G_EXEC sed --follow-symlinks -i '/# Start DietPi-Software/i\sed -i '\''/# Custom 1st run script/i\\G_AGI 7zip'\'' /boot/dietpi/dietpi-software' rootfs/boot/dietpi/dietpi-login
642+
#G_EXEC sed --follow-symlinks -i '/# Start DietPi-Software/i\sed -i '\''/# Custom 1st run script/i\\G_THREAD_WAIT'\'' /boot/dietpi/dietpi-software' rootfs/boot/dietpi/dietpi-login
643+
644+
#G_EXEC sed --follow-symlinks -i '/# Start DietPi-Software/i\sed -i '\''/# Custom 1st run script/i\\Download_Install https://dietpi.com/downloads/binaries/rpi/dxx-rebirth.7z'\'' /boot/dietpi/dietpi-software' rootfs/boot/dietpi/dietpi-login
645+
646+
apparmor_status
647+
G_EXEC systemctl mask --now apparmor
648+
622649
##########################################
623650
# Boot container
624651
##########################################

dietpi/dietpi-software

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2636,7 +2636,7 @@ sudo sysctl -p /etc/sysctl.d/dietpi-$1.conf"
26362636
'matrix-synapse') (( $G_DISTRO > 7 || $G_HW_ARCH < 3 || $G_HW_ARCH == 11 )) && rust=1;;
26372637
'netifaces') (( $piwheels || ( $G_HW_ARCH == 10 && $G_DISTRO == 6 ) )) || aDEPS+=('gcc');;
26382638
'numpy')
2639-
(( $G_HW_ARCH < 3 || $G_HW_ARCH == 11 )) && { aDEPS+=('g++' 'pkg-config'); (( $G_HW_ARCH == 1 && $G_DISTRO > 7 )) && aDEPS+=('libblas-dev') || aDEPS+=('libopenblas-dev'); } # ARMv6 Trixie: https://bugs.launchpad.net/raspbian/+bug/2120259
2639+
(( $G_HW_ARCH < 3 || $G_HW_ARCH == 11 )) && aDEPS+=('g++' 'pkg-config' 'libopenblas-pthread-dev')
26402640
# cmake + make + automake > patchelf > meson-python > numpy
26412641
# cmake > ninja > meson-python > numpy
26422642
(( $G_HW_ARCH == 1 || $G_HW_ARCH == 11 )) && aDEPS+=('cmake' 'make' 'automake')

0 commit comments

Comments
 (0)