Skip to content

Commit 168146a

Browse files
committed
Use FreeBSD 15.0-RELEASE in CI
And remove the obsolete FreeBSD 14.2-RELEASE. Sponsored by: ConnectWise Signed-off-by: Alan Somers <[email protected]>
1 parent 05e2747 commit 168146a

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

.github/workflows/scripts/qemu-2-start.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,6 @@ case "$OS" in
9595
KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz"
9696
NIC="rtl8139"
9797
;;
98-
freebsd14-2r)
99-
FreeBSD="14.2-RELEASE"
100-
OSNAME="FreeBSD $FreeBSD"
101-
OSv="freebsd14.0"
102-
URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI.raw.xz"
103-
KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz"
104-
;;
10598
freebsd14-3r)
10699
FreeBSD="14.3-RELEASE"
107100
OSNAME="FreeBSD $FreeBSD"
@@ -124,6 +117,13 @@ case "$OS" in
124117
URLxz="$FREEBSD_SNAP/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz"
125118
KSRC="$FREEBSD_SNAP/../amd64/$FreeBSD/src.txz"
126119
;;
120+
freebsd15-0r)
121+
FreeBSD="15.0-RELEASE"
122+
OSNAME="FreeBSD $FreeBSD"
123+
OSv="freebsd15.0"
124+
URLxz="$FREEBSD_REL/$FreeBSD/amd64/Latest/FreeBSD-$FreeBSD-amd64-BASIC-CI-ufs.raw.xz"
125+
KSRC="$FREEBSD_REL/../amd64/$FreeBSD/src.txz"
126+
;;
127127
freebsd15-0s)
128128
FreeBSD="15.0-STABLE"
129129
OSNAME="FreeBSD $FreeBSD"

.github/workflows/zfs-qemu.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ jobs:
4040
4141
case "$ci_type" in
4242
quick)
43-
os_selection='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd15-0s", "ubuntu24"]'
43+
os_selection='["almalinux8", "almalinux9", "almalinux10", "debian12", "fedora42", "freebsd15-0r", "ubuntu24"]'
4444
;;
4545
linux)
4646
os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian11", "debian12", "debian13", "fedora41", "fedora42", "fedora43", "ubuntu22", "ubuntu24"]'
4747
;;
4848
freebsd)
49-
os_selection='["freebsd13-5r", "freebsd14-2r", "freebsd14-3r", "freebsd13-5s", "freebsd14-3s", "freebsd15-0s", "freebsd16-0c"]'
49+
os_selection='["freebsd13-5r", "freebsd14-3r", "freebsd13-5s", "freebsd14-3s", "freebsd15-0r", "freebsd15-0s", "freebsd16-0c"]'
5050
;;
5151
*)
5252
# default list
53-
os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora42", "fedora43", "freebsd14-3r", "freebsd15-0s", "freebsd16-0c", "ubuntu22", "ubuntu24"]'
53+
os_selection='["almalinux8", "almalinux9", "almalinux10", "centos-stream9", "centos-stream10", "debian12", "debian13", "fedora42", "fedora43", "freebsd14-3r", "freebsd15-0r", "freebsd16-0c", "ubuntu22", "ubuntu24"]'
5454
;;
5555
esac
5656
@@ -76,7 +76,7 @@ jobs:
7676
# debian: debian12, debian13, ubuntu22, ubuntu24
7777
# misc: archlinux, tumbleweed
7878
# FreeBSD variants of november 2025:
79-
# FreeBSD Release: freebsd13-5r, freebsd14-2r, freebsd14-3r
79+
# FreeBSD Release: freebsd13-5r, freebsd14-3r, freebsd15-0r
8080
# FreeBSD Stable: freebsd13-5s, freebsd14-3s, freebsd15-0s
8181
# FreeBSD Current: freebsd16-0c
8282
os: ${{ fromJson(needs.test-config.outputs.test_os) }}

0 commit comments

Comments
 (0)