Update FreeBSD CI to 13.2-RELEASE (#1879)

It's not safe to run sccache-dist unit tests in parallel.
mozilla · Sep 5, 2023 · 46a3232 · 46a3232
1 parent 378c937
commit 46a3232
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -258,15 +258,15 @@ jobs:
           fail_ci_if_error: false
 
   test_freebsd:
-    name: test freebsd-13.1 rust stable
+    name: test freebsd-13.2 rust stable
     runs-on: ${{ matrix.job.os }}
     timeout-minutes: 70
     strategy:
       fail-fast: false
       matrix:
         job:
           - { os: macos-12 }
-        release: ["13.1"]
+        release: ["13.2"]
     steps:
       - uses: actions/checkout@v4
       - name: Prepare, build and test
@@ -317,7 +317,7 @@ jobs:
         if: failure()
         uses: ./.github/actions/artifact_failure
         with:
-          name: test-freebsd-13.1-stable
+          name: test-freebsd-13.2-stable
 
   release:
     name: release

diff --git a/docs/DistributedFreeBSD.md b/docs/DistributedFreeBSD.md
@@ -25,7 +25,7 @@ It's up to the user to create the reference pot that serves as a template
 to clone from when instantiating image and build containers, e.g.:
 
 ```sh
-pot create -p sccache-template -N alias -i "lo0|127.0.0.2" -t single -b 13.1
+pot create -p sccache-template -N alias -i "lo0|127.0.0.2" -t single -b 13.2
 pot set-cmd -p sccache-template -c /usr/bin/true
 pot set-attr -p sccache-template -A no-rc-script -V YES
 pot snapshot -p sccache-template

diff --git a/scripts/freebsd-ci-test.sh b/scripts/freebsd-ci-test.sh
@@ -24,8 +24,8 @@
 # $HOME/.potcache
 #
 #     mkdir $HOME/.potcache
-#     fetch -o $HOME/.potcache/13.1-RELEASE_base.txz \
-#     https://ftp.freebsd.org/pub/FreeBSD/releases/amd64/13.1-RELEASE/base.txz
+#     fetch -o $HOME/.potcache/13.2-RELEASE_base.txz \
+#     https://ftp.freebsd.org/pub/FreeBSD/releases/amd64/13.2-RELEASE/base.txz
 #
 # This script can be run from a github action. When run locally, make
 # sure to install the required packages:
@@ -78,7 +78,8 @@ build_and_test_project()
 	export RUSTFLAGS="-C debuginfo=0"
 	cargo build --features "dist-client,dist-server" || FAULT=1
 	echo "#### testing sccache (cargo)"
-	cargo test --features "dist-client,dist-server" || FAULT=1
+	cargo test --features "dist-client,dist-server" -- \
+	  --test-threads 1 || FAULT=1
 	unset RUSTFLAGS
 	if [ "$FAULT" -eq 0 ]; then
 		# save build time by avoiding "cargo install"