Merge pull request #104 from andrewbird/ci-100

CI: Move various things into proper places
dosemu2 · Jan 17, 2025 · 8082524 · 8082524
2 parents fee64c6 + cc2f8f4
commit 8082524
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -3,3 +3,5 @@
 set -e
 
 make deb
+
+make 32 -j 9
diff --git 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
@@ -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
@@ -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