Skip to content

Commit b38c288

Browse files
authored
Merge pull request #1185 from tormodvolden/ci_update24
Get CI running again
2 parents 19f5f10 + 7cc9be0 commit b38c288

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: false # keep on building even if one target fails
1717
matrix:
1818
target: [appleiie, dragon-mooh, dragon-nx32, esp32, esp8266, multicomp09, rbc-mark4, rcbus-6502, rcbus-68008, rpipico, sc108, tiny68k, armm0-libc]
19-
runs-on: ubuntu-20.04
19+
runs-on: ubuntu-24.04
2020
steps:
2121
- uses: actions/checkout@v3
2222
- name: install build deps
@@ -29,7 +29,6 @@ jobs:
2929
echo "sub_target=libs" >> $GITHUB_ENV
3030
;;
3131
dragon-mooh|dragon-nx32|multicomp09)
32-
sudo add-apt-repository -n -y ppa:p-pisati/fuzix
3332
sudo add-apt-repository -n -y ppa:tormodvolden/m6809
3433
PKGS="lwtools gcc6809 xroar"
3534
echo "target=TARGET=${{ matrix.target }}" >> $GITHUB_ENV

Build/tests/test-dragon-mooh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ echo "Starting XRoar $(date)"
2929
xroar \
3030
-no-ratelimit \
3131
-ui $UI \
32+
-ao null \
3233
-timeout 60 \
3334
-timeout-motoroff 10 \
3435
-default-machine dragon32 -romlist d32=$BASROM \
3536
-cart mooh -cart-rom $CARTROM -load-hd0 $IMAGE \
37+
-cart-opt mooh-crt9128-stderr \
3638
2>&1 | tee $LOGFILE
3739
echo "XRoar done $(date)"
3840

Kernel/platform/platform-dragon-nx32/userspace/rc.ci_testing

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ prtroot >/etc/mtab
88
#fsck -a
99
#mount -a
1010
>/var/run/utmp
11-
echo "Starting various tests from rc"
12-
echo '[dc is working] P' | dc ; echo
13-
echo "Testing done!"
11+
echo "Starting various tests from /etc/rc:"
12+
echo '[dc is working OK] P' | dc ; echo
13+
echo "shell pipeline" | head | tail | sed 's/$/ OK/' | cat
14+
echo ': test1 ." fforth is working OK" CR ; test1' | fforth
15+
echo "Testing done! Cycling motor relay..."
1416
echo "HEX 3c ff21 C! 34 ff21 C!" | fforth

0 commit comments

Comments
 (0)