From ff78ab9d1ec729234d6fe5c088d31fd09e8a71e0 Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Sun, 9 Mar 2025 10:33:57 +0900
Subject: [PATCH] .github/workflows: clean up test.yml

---
 .github/scripts/bsd_tests.sh | 4 ++--
 .github/workflows/test.yml   | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/bsd_tests.sh b/.github/scripts/bsd_tests.sh
index 08ddc41..d1503d4 100755
--- a/.github/scripts/bsd_tests.sh
+++ b/.github/scripts/bsd_tests.sh
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: Apache-2.0
 # SPDX-FileCopyrightText: 2025 The Ebitengine Authors
 
-# FreeBSD & NetBSD tests run within QEMU on Ubuntu.
-# vmactions/freebsd-vm only supports a single "step" where it
+# BSD tests run within QEMU on Ubuntu.
+# vmactions/*-vm only supports a single "step" where it
 # brings down the VM at the end of the step, so all
 # the commands to run need to be put into this single block.
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2759fd9..5beaf5b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -142,7 +142,7 @@ jobs:
     strategy:
       matrix:
         os: ['FreeBSD', 'NetBSD']
-        go: ['1.18.10', '1.19.13', '1.20.14', '1.21.13', '1.22.12', '1.23.6', '1.24.0']
+        go: ['1.18.10', '1.19.13', '1.20.14', '1.21.13', '1.22.12', '1.23.7', '1.24.1']
     name: Test with Go ${{ matrix.go }} on ${{ matrix.os }}
     runs-on: ubuntu-22.04
     defaults:
@@ -150,7 +150,7 @@ jobs:
         shell: bash
     steps:
       - uses: actions/checkout@v4
-      - name: Run in freebsd
+      - name: Run in FreeBSD
         if: matrix.os == 'FreeBSD'
         uses: vmactions/freebsd-vm@v1
         with:
@@ -158,20 +158,17 @@ jobs:
           prepare: |
             fetch https://go.dev/dl/go${{matrix.go}}.freebsd-amd64.tar.gz
             rm -fr /usr/local/go && tar -C /usr/local -xf go${{matrix.go}}.freebsd-amd64.tar.gz
-            ln -s /usr/local/go/bin/go /usr/local/bin
             chmod +x $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh
           run: $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh
-      - name: Run in netbsd
+      - name: Run in NetBSD
         # there are no prebuilt download links for these versions of Go for NetBSD
         if: matrix.os == 'NetBSD' && !startsWith(matrix.go, '1.18.') && !startsWith(matrix.go, '1.19.') && !startsWith(matrix.go, '1.20.')
         uses: vmactions/netbsd-vm@v1
         with:
           usesh: true
           prepare: |
-            /usr/sbin/pkg_add -v bash
             ftp https://go.dev/dl/go${{matrix.go}}.netbsd-amd64.tar.gz
             mkdir /usr/local
             rm -fr /usr/local/go && tar -C /usr/local -xf go${{matrix.go}}.netbsd-amd64.tar.gz
-            ln -s /usr/local/go/bin/go /usr/local/bin
             chmod +x $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh
           run: $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh