Skip to content

Commit 29f3ad9

Browse files
committed
update FreeBSD CI to 15.0
1 parent 9dbb20b commit 29f3ad9

1 file changed

Lines changed: 13 additions & 10 deletions

File tree

.github/workflows/make.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -312,22 +312,25 @@ jobs:
312312
uses: vmactions/freebsd-vm@v1
313313
with:
314314
envs: FPC_VERSION LAZARUS_BRANCH LAZARUS_REPO
315-
# Pinned to 14.3 to avoid the broken FreeBSD:15:amd64 pkg
316-
# cluster (see https://github.com/freebsd/pkg/issues/2653).
317-
# Revisit once 15.x package infrastructure stabilises.
318-
release: "14.3"
315+
release: "15.0"
319316
usesh: true
320317
prepare: |
321318
# ─── INTERIM: pkg install fpc ──────────────────────────
322-
# Workaround for periodic FreeBSD pkg cluster breakage:
323-
# bootstrap pkg fresh, force-refresh the catalog, and
324-
# align pre-installed VM packages with the current repo
325-
# before installing new ones — otherwise newly-installed
326-
# packages may link against newer libs than the VM image
327-
# ships.
319+
# Workaround for periodic FreeBSD pkg cluster breakage
320+
# (see https://github.com/freebsd/pkg/issues/2653):
321+
# bootstrap pkg fresh, then prime the repo metadata with
322+
# a fetch-only upgrade before the real catalog refresh —
323+
# this sidesteps transient broken-cluster states on the
324+
# FreeBSD:15:amd64/latest repo. After that, force-refresh
325+
# the catalog and align pre-installed VM packages with
326+
# the current repo before installing new ones — otherwise
327+
# newly-installed packages may link against newer libs
328+
# than the VM image ships.
328329
export ASSUME_ALWAYS_YES=yes
329330
export IGNORE_OSVERSION=yes
330331
pkg bootstrap -f
332+
# Prime repo metadata (fetch-only) before the real update.
333+
pkg upgrade -Fqy || true
331334
pkg update -f
332335
pkg upgrade -y
333336

0 commit comments

Comments
 (0)