From bbdadf88e72f990bb660b04897d17cc4c5e96e11 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Mon, 8 Jan 2024 17:53:59 +0100 Subject: [PATCH] ci: switch away from EOL'd FreeBSD 12.4 to 13.2 Signed-off-by: Yann Dirson --- .gitlab-ci.yml | 18 +++++++++--------- CHANGELOG.md | 5 +++++ Cross.toml | 9 +++++---- devscripts/freebsd-fetch-package.sh | 5 +++-- doc/release.md | 2 +- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0424b35..57a8a48 100644 --- 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 1a388b3..bf94e72 100644 --- 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 d6b04be..779f5ee 100644 --- 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 3362469..7db9366 100755 --- 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 5a3f031..634c0ef 100644 --- 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 \ -- 2.39.5