From cc2f8f4ef3dedad82173d606eacd85461ccacd25 Mon Sep 17 00:00:00 2001
From: Andrew Bird <ajb@spheresystems.co.uk>
Date: Mon, 29 Jul 2024 17:41:19 +0100
Subject: [PATCH] CI: Move various things into proper places

---
 .github/workflows/ci-build.yml | 3 +++
 ci_build.sh                    | 2 ++
 ci_prereq.sh                   | 4 +++-
 ci_test.sh                     | 5 -----
 ci_test_prereq.sh              | 7 +++----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 58e11f6..0b75590 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -24,5 +24,8 @@ jobs:
     - name: build
       run: ./ci_build.sh
 
+    - name: test prerequisites
+      run: ./ci_test_prereq.sh
+
     - name: test
       run: ./ci_test.sh
diff --git a/ci_build.sh b/ci_build.sh
index 734da9b..63710f5 100755
--- a/ci_build.sh
+++ b/ci_build.sh
@@ -3,3 +3,5 @@
 set -e
 
 make deb
+
+make 32 -j 9
diff --git a/ci_prereq.sh b/ci_prereq.sh
index 86d7275..3420563 100755
--- a/ci_prereq.sh
+++ b/ci_prereq.sh
@@ -1,9 +1,11 @@
 #!/bin/sh
 
+sudo add-apt-repository ppa:jwt27/djgpp-toolchain
 sudo apt-get update
 sudo apt install -y \
   devscripts \
-  equivs
+  equivs \
+  gcc-djgpp
 
 sudo add-apt-repository ppa:stsp-0/thunk-gen
 sudo add-apt-repository ppa:stsp-0/dj64
diff --git a/ci_test.sh b/ci_test.sh
index 035f896..9d2413c 100755
--- a/ci_test.sh
+++ b/ci_test.sh
@@ -2,10 +2,6 @@
 
 set -e
 
-sudo dpkg -i ../comcom64*.deb
-
-. ./ci_test_prereq.sh
-
 if ! dosemu -td -o boot.log -E ver ; then
   {
     echo "================== boot.log ==================="
@@ -15,6 +11,5 @@ if ! dosemu -td -o boot.log -E ver ; then
   exit 1
 fi
 
-make 32 -j 9
 # make sure 32bit version also built
 ls -l 32/comcom32.exe
diff --git a/ci_test_prereq.sh b/ci_test_prereq.sh
index 0454fcd..f56ae49 100755
--- a/ci_test_prereq.sh
+++ b/ci_test_prereq.sh
@@ -1,10 +1,9 @@
 #!/bin/sh
 
 sudo add-apt-repository ppa:dosemu2/ppa
-sudo add-apt-repository ppa:jwt27/djgpp-toolchain
 
 sudo apt update -q
 
-sudo apt install -y \
-  gcc-djgpp \
-  dosemu2
+sudo apt install -y dosemu2
+
+sudo dpkg -i ../comcom64*.deb