Skip to content

Commit 3980773

Browse files
authored
.github/workflows: clean up test.yml (#301)
1 parent 1bd362f commit 3980773

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

.github/scripts/bsd_tests.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# SPDX-License-Identifier: Apache-2.0
44
# SPDX-FileCopyrightText: 2025 The Ebitengine Authors
55

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
88
# brings down the VM at the end of the step, so all
99
# the commands to run need to be put into this single block.
1010

.github/workflows/test.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -142,36 +142,33 @@ jobs:
142142
strategy:
143143
matrix:
144144
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']
146146
name: Test with Go ${{ matrix.go }} on ${{ matrix.os }}
147147
runs-on: ubuntu-22.04
148148
defaults:
149149
run:
150150
shell: bash
151151
steps:
152152
- uses: actions/checkout@v4
153-
- name: Run in freebsd
153+
- name: Run in FreeBSD
154154
if: matrix.os == 'FreeBSD'
155155
uses: vmactions/freebsd-vm@v1
156156
with:
157157
usesh: true
158158
prepare: |
159159
fetch https://go.dev/dl/go${{matrix.go}}.freebsd-amd64.tar.gz
160160
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
162161
chmod +x $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh
163162
run: $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh
164-
- name: Run in netbsd
163+
- name: Run in NetBSD
165164
# there are no prebuilt download links for these versions of Go for NetBSD
166165
if: matrix.os == 'NetBSD' && !startsWith(matrix.go, '1.18.') && !startsWith(matrix.go, '1.19.') && !startsWith(matrix.go, '1.20.')
167166
uses: vmactions/netbsd-vm@v1
168167
with:
169168
usesh: true
170169
prepare: |
171-
/usr/sbin/pkg_add -v bash
172170
ftp https://go.dev/dl/go${{matrix.go}}.netbsd-amd64.tar.gz
173171
mkdir /usr/local
174172
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
176173
chmod +x $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh
177174
run: $GITHUB_WORKSPACE/.github/scripts/bsd_tests.sh

0 commit comments

Comments
 (0)