From e9f3022173556ed61d066fd679e723e4f8e614db Mon Sep 17 00:00:00 2001
From: "D. Bohdan" <dbohdan@dbohdan.com>
Date: Fri, 10 May 2024 10:10:21 +0000
Subject: [PATCH] ci(github): mv `sudo`, `gmake test` out of script

Rename the script `install-deps.sh`.

Upgrade cross-platform-actions to version 0.24.0.
---
 .github/workflows/ci.sh           | 24 ------------------------
 .github/workflows/ci.yml          | 17 +++++++++++++----
 .github/workflows/install-deps.sh | 20 ++++++++++++++++++++
 3 files changed, 33 insertions(+), 28 deletions(-)
 delete mode 100755 .github/workflows/ci.sh
 create mode 100755 .github/workflows/install-deps.sh

diff --git a/.github/workflows/ci.sh b/.github/workflows/ci.sh
deleted file mode 100755
index d4a08df..0000000
--- a/.github/workflows/ci.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ "$(uname)" = Linux ]; then
-    sudo apt install -y graphicsmagick
-fi
-
-if [ "$(uname)" = FreeBSD ]; then
-    sudo pkg install -y gmake GraphicsMagick tcl86
-    sudo ln -s /usr/local/bin/tclsh8.6 /usr/local/bin/tclsh
-fi
-
-if [ "$(uname)" = NetBSD ]; then
-    sudo pkgin -y install gmake GraphicsMagick tcl
-fi
-
-if [ "$(uname)" = OpenBSD ]; then
-    # doas(1) isn't configured.
-    # See https://github.com/cross-platform-actions/action/issues/75
-    sudo pkg_add -I gmake GraphicsMagick tcl%8.6
-    sudo ln -s /usr/local/bin/tclsh8.6 /usr/local/bin/tclsh
-fi
-
-gmake test
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9b8d71..39a33ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,8 +6,13 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
-    - name: Run CI script
-      run: .github/workflows/ci.sh 
+    - name: Install dependencies
+      run: |
+        sudo .github/workflows/install-deps.sh
+    - name: Test
+      run: |
+        gmake test
+
   test-bsd:
     runs-on: ${{ matrix.os.host }}
     strategy:
@@ -30,11 +35,15 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Run CI script on ${{ matrix.os.name }}
-        uses: cross-platform-actions/action@v0.22.0
+        uses: cross-platform-actions/action@v0.24.0
         with:
           operating_system: ${{ matrix.os.name }}
           architecture: ${{ matrix.os.architecture }}
           version: ${{ matrix.os.version }}
           shell: bash
           run: |
-            .github/workflows/ci.sh
+            # Use sudo(1) rather than doas(1) on OpenBSD.
+            # doas(1) isn't configured.
+            # See https://github.com/cross-platform-actions/action/issues/75
+            sudo .github/workflows/install-deps.sh
+            gmake test
diff --git a/.github/workflows/install-deps.sh b/.github/workflows/install-deps.sh
new file mode 100755
index 0000000..2e6f9a2
--- /dev/null
+++ b/.github/workflows/install-deps.sh
@@ -0,0 +1,20 @@
+#! /bin/sh
+set -e
+
+if [ "$(uname)" = Linux ]; then
+    apt-get install -y graphicsmagick
+fi
+
+if [ "$(uname)" = FreeBSD ]; then
+    pkg install -y gmake GraphicsMagick tcl86
+    ln -s /usr/local/bin/tclsh8.6 /usr/local/bin/tclsh
+fi
+
+if [ "$(uname)" = NetBSD ]; then
+    pkgin -y install gmake GraphicsMagick tcl
+fi
+
+if [ "$(uname)" = OpenBSD ]; then
+    pkg_add -I gmake GraphicsMagick tcl%8.6
+    ln -s /usr/local/bin/tclsh8.6 /usr/local/bin/tclsh
+fi