ci: switch away from EOL'd FreeBSD 12.4 to 13.2

Signed-off-by: Yann Dirson <yann.dirson@vates.fr>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0424b352934d852ae1dd8f8210f5374ee96eccc1..57a8a489274a9b4c92131a491997c64abb532ea0 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,13 +40,13 @@ variables:
     - . "$HOME/.cargo/env"
     - rustup target add $CARGO_BUILD_TARGET
 
-.cross-freebsd12-x86_64-build-template:
+.cross-freebsd13-x86_64-build-template:
   allow_failure: true
   extends:
     - .cross-build-template
   variables:
     CARGO_BUILD_TARGET: "x86_64-unknown-freebsd"
-    CROSS_SYSROOT: "/usr/local/x86_64-unknown-freebsd12"
+    CROSS_SYSROOT: "/usr/local/x86_64-unknown-freebsd13"
   before_script:
     - !reference [.cross-build-template,before_script]
     # cross sysroot does not match its toolchain
@@ -186,17 +186,17 @@ build-release-linux-x86_64:
     paths:
       - target/release/xen-guest-agent
 
-build-freebsd12-x86_64:
+build-freebsd13-x86_64:
   parallel: !reference [.featurematrix.no-netlink,parallel]
   extends:
-    - .cross-freebsd12-x86_64-build-template
+    - .cross-freebsd13-x86_64-build-template
     - .not-scheduled
   variables:
     CARGO_FLAGS: "-v"
 
-build-release-freebsd12-x86_64:
+build-release-freebsd13-x86_64:
   extends:
-    - .cross-freebsd12-x86_64-build-template
+    - .cross-freebsd13-x86_64-build-template
     - .not-scheduled
   variables:
     FEATURES: "--no-default-features -F xenstore,net_pnet"
@@ -245,15 +245,15 @@ build-latest-linux:
     # show which dependencies changed in Cargo.lock
     - git diff
 
-build-latest-freebsd12-x86_64:
+build-latest-freebsd13-x86_64:
   parallel: !reference [.featurematrix.no-netlink,parallel]
   extends:
-    - .cross-freebsd12-x86_64-build-template
+    - .cross-freebsd13-x86_64-build-template
     - .scheduled
   variables:
     CARGO_FLAGS: "-v"
   before_script:
-    - !reference [".cross-freebsd12-x86_64-build-template", "before_script"]
+    - !reference [".cross-freebsd13-x86_64-build-template", "before_script"]
     - mv Cargo.lock Cargo.lock.current
   after_script:
     # show which dependencies changed in Cargo.lock

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a388b391ded0dd1caa691952b19fdfcf32f007b..bf94e72f3b38be96b50f76f96ab7986d0b0ab8e1 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## 0.4.0 - unreleased
 
+### other noteworthy changes
+
+* CI pipelines stopped producing binaries for EOL'd FreeBSD 12.4,
+  switched to 13.2
+
 ## 0.3.0 - 2023-12-15
 
 ### new features

diff --git a/Cross.toml b/Cross.toml
index d6b04be3dbff943fc49f760f8142aacdb6a216c3..779f5ee3de273d63583744a1515b5608bff10829 100644 (file)
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,11 +1,12 @@
 # this file is not used by CI job, but allows to make local cross builds
 [target.x86_64-unknown-freebsd]
+image = "localhost/freebsd:13-latest"
 pre-build = ["""
-mkdir -p /usr/local/x86_64-unknown-freebsd12/usr &&
-ln -s ../include /usr/local/x86_64-unknown-freebsd12/usr/include &&
-ln -s ../lib /usr/local/x86_64-unknown-freebsd12/usr/lib &&
+mkdir -p /usr/local/x86_64-unknown-freebsd13/usr &&
+ln -s ../include /usr/local/x86_64-unknown-freebsd13/usr/include &&
+ln -s ../lib /usr/local/x86_64-unknown-freebsd13/usr/lib &&
 PKG=$(./devscripts/freebsd-fetch-package.sh xen-tools) &&
-tar -C /usr/local/x86_64-unknown-freebsd12/ --xform s,^/usr/local/,/usr/, -xf $PKG
+tar -C /usr/local/x86_64-unknown-freebsd13/ --xform s,^/usr/local/,/usr/, -xf $PKG
 """]
 
 [target.aarch64-unknown-linux-gnu]

diff --git a/devscripts/freebsd-fetch-package.sh b/devscripts/freebsd-fetch-package.sh
index 3362469028522181f1b43bcdceb940025b8958cf..7db93661c4d096601cc01cb14b7da65f49065838 100755 (executable)
--- a/devscripts/freebsd-fetch-package.sh
+++ b/devscripts/freebsd-fetch-package.sh
@@ -3,10 +3,11 @@ set -e
 
 PKGNAME="$1"
 
-PKG=$(curl -s http://pkg.freebsd.org/FreeBSD:12:amd64/release_4/packagesite.txz |
+BASE_URL="http://pkg.freebsd.org/FreeBSD:13:amd64/release_2"
+PKG=$(curl -s ${BASE_URL}/packagesite.txz |
       unxz | tar -x packagesite.yaml -O |
       grep '"name":"'$PKGNAME'"' |
       sed 's/.*"path":"\([^"]*\)".*/\1/')
-curl -O http://pkg.freebsd.org/FreeBSD:12:amd64/release_4/"$PKG"
+curl -O ${BASE_URL}/"$PKG"
 
 echo "$(basename "$PKG")"

diff --git a/doc/release.md b/doc/release.md
index 5a3f03103d6fa9eaee821c25789305bb92c23a1e..634c0efe01aa8c10cd67ec6fd4e1a9dd11b10ed9 100644 (file)
--- a/doc/release.md
+++ b/doc/release.md
@@ -114,7 +114,7 @@ Then build:
 > These instructions do not imply using a clean container (yet); if
 > you expect reproducibility some extra measures might be needed.
 
-On old-enough FreeBSD x86_64 guest version (FreeBSD 12):
+On oldest supported FreeBSD x86_64 version (curently FreeBSD 13.2):
 
 ```
 BINDGEN_EXTRA_CLANG_ARGS=-I/usr/local/include \