.github/workflows: clean up test.yml (#301)

commit: 398077311e87fe4247a32396d0fb89e04e23a6c4
author: Hajime Hoshi · 19mo ago · 2025-03-09 05:10 UTC
committer: GitHub · 19mo ago · 2025-03-09 05:10 UTC
parent: 1bd362f
signature: GPG UnverifiedB5690EEEBB952194 The key is unknown

2 files · +5 -8

M .github/scripts/bsd_tests.sh +2 -2


@@ -3,8 +3,8 @@
3	3		# SPDX-License-Identifier: Apache-2.0
4	4		# SPDX-FileCopyrightText: 2025 The Ebitengine Authors
5	5
6		-	# FreeBSD & NetBSD tests run within QEMU on Ubuntu.
7		-	# vmactions/freebsd-vm only supports a single "step" where it
	6	+	# BSD tests run within QEMU on Ubuntu.
	7	+	# vmactions/*-vm only supports a single "step" where it
8	8		# brings down the VM at the end of the step, so all
9	9		# the commands to run need to be put into this single block.
10	10


@@ -3,8 +3,8 @@
3		# SPDX-License-Identifier: Apache-2.0	3		# SPDX-License-Identifier: Apache-2.0
4		# SPDX-FileCopyrightText: 2025 The Ebitengine Authors	4		# SPDX-FileCopyrightText: 2025 The Ebitengine Authors
5			5
6	-	# FreeBSD & NetBSD tests run within QEMU on Ubuntu.	6	+	# BSD tests run within QEMU on Ubuntu.
7	-	# vmactions/freebsd-vm only supports a single "step" where it	7	+	# vmactions/*-vm only supports a single "step" where it
8		# brings down the VM at the end of the step, so all	8		# brings down the VM at the end of the step, so all
9		# the commands to run need to be put into this single block.	9		# the commands to run need to be put into this single block.
10			10

M .github/workflows/test.yml +3 -6


@@ -142,7 +142,7 @@ jobs:
142	142		strategy:
143	143		matrix:
144	144		os: ['FreeBSD', 'NetBSD']
145		-	go: ['1.18.10', '1.19.13', '1.20.14', '1.21.13', '1.22.12', '1.23.6', '1.24.0']
	145	+	go: ['1.18.10', '1.19.13', '1.20.14', '1.21.13', '1.22.12', '1.23.7', '1.24.1']
146	146		name: Test with Go ${{ matrix.go }} on ${{ matrix.os }}
147	147		runs-on: ubuntu-22.04
148	148		defaults:

@@ -150,7 +150,7 @@ jobs:
150	150		shell: bash
151	151		steps:
152	152		- uses: actions/checkout@v4
153		-	- name: Run in freebsd
	153	+	- name: Run in FreeBSD
154	154		if: matrix.os == 'FreeBSD'
155	155		uses: vmactions/freebsd-vm@v1
156	156		with:

@@ -158,20 +158,17 @@ jobs:
158	158		prepare: \|
159	159		fetch https://go.dev/dl/go${{matrix.go}}.freebsd-amd64.tar.gz
160	160		rm -fr /usr/local/go && tar -C /usr/local -xf go${{matrix.go}}.freebsd-amd64.tar.gz
161		-	ln -s /usr/local/go/bin/go /usr/local/bin
162	161		chmod +x $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh
163	162		run: $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh
164		-	- name: Run in netbsd
	163	+	- name: Run in NetBSD
165	164		# there are no prebuilt download links for these versions of Go for NetBSD
166	165		if: matrix.os == 'NetBSD' && !startsWith(matrix.go, '1.18.') && !startsWith(matrix.go, '1.19.') && !startsWith(matrix.go, '1.20.')
167	166		uses: vmactions/netbsd-vm@v1
168	167		with:
169	168		usesh: true
170	169		prepare: \|
171		-	/usr/sbin/pkg_add -v bash
172	170		ftp https://go.dev/dl/go${{matrix.go}}.netbsd-amd64.tar.gz
173	171		mkdir /usr/local
174	172		rm -fr /usr/local/go && tar -C /usr/local -xf go${{matrix.go}}.netbsd-amd64.tar.gz
175		-	ln -s /usr/local/go/bin/go /usr/local/bin
176	173		chmod +x $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh
177	174		run: $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh

     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:
         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:
           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