From e75000ef434c4e642b5b97aa89c5af6634a90958 Mon Sep 17 00:00:00 2001 From: Stephan Bauroth Date: Thu, 5 Nov 2026 19:55:26 +0100 Subject: [PATCH 1/2] build-bench-env.sh: add ruby to the alpine and arch package lists for rbstress rbstress runs `ruby stress_mem.rb` and bench.sh has no guard for a missing interpreter, so both rbstress tests fail wherever ruby is not installed. The ubuntu and fedora package lists install it; the alpine and arch ones do not. --- build-bench-env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-bench-env.sh b/build-bench-env.sh index 99c5234..72eaab7 100755 --- a/build-bench-env.sh +++ b/build-bench-env.sh @@ -483,7 +483,7 @@ if test "$setup_packages" = "1"; then elif grep -q -e 'ID=alpine' /etc/os-release 2>/dev/null; then echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories apk update - apkinstall "clang lld unzip dos2unix bc gmp-dev wget cmake python3 automake gawk \ + apkinstall "clang lld unzip dos2unix bc gmp-dev wget cmake python3 ruby automake gawk \ samurai libtool git cargo build-base linux-headers autoconf util-linux sed \ ghostscript libatomic gflags-dev readline-dev snappy-dev \ flex bison elfutils-dev" @@ -492,7 +492,7 @@ if test "$setup_packages" = "1"; then brewinstall "dos2unix wget cmake ninja automake libtool gnu-time gmp mpir gnu-sed \ ghostscript bazelisk gflags snappy rust" elif grep -q 'Arch Linux' /etc/os-release; then - sudo pacman -S dos2unix wget cmake ninja automake libtool time gmp sed ghostscript bazelisk gflags snappy rust flex bison libelf + sudo pacman -S dos2unix wget cmake ninja automake libtool time gmp sed ghostscript bazelisk gflags snappy rust ruby flex bison libelf fi fi From 62750cff2e92bad6f342395d3e2bb674fac47426 Mon Sep 17 00:00:00 2001 From: Stephan Bauroth Date: Thu, 5 Nov 2026 19:55:30 +0100 Subject: [PATCH 2/2] Bump linux to 6.6.105 6.5.1 no longer builds with gcc 15: arch/x86/boot redefines set_bit and ARRAY_SIZE against the asm-generic headers, so the linux test fails on alpine 3.24. --- bench.sh | 2 +- build-bench-env.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bench.sh b/bench.sh index 774bc3a..8b9bc5c 100755 --- a/bench.sh +++ b/bench.sh @@ -29,7 +29,7 @@ readonly tests_exclude_macos="sh6bench sh8bench redis" readonly version_redis=6.2.7 readonly version_rocksdb=10.10.1 -readonly version_linux=6.5.1 +readonly version_linux=6.6.105 # -------------------------------------------------------------------- # Environment diff --git a/build-bench-env.sh b/build-bench-env.sh index 72eaab7..c8ec595 100755 --- a/build-bench-env.sh +++ b/build-bench-env.sh @@ -75,7 +75,7 @@ readonly version_lean=21d264a66d53b0a910178ae7d9529cb5886a39b6 # build fix for r readonly version_mathlib=release_812 readonly version_rocksdb=10.10.1 readonly version_lua=v5.4.7 -readonly version_linux=6.5.1 +readonly version_linux=6.6.105 readonly version_bazel=8.8.0 readonly version_rust=1.87.0