From 41bf394857ac23ce4bbc9c2a2e8e66ed1fc00e4a Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Sun, 12 Jan 2025 12:47:51 -0800
Subject: [PATCH 1/2] Update smoke-test expecatations.

---
 .github/bin/smoke-test.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/bin/smoke-test.sh b/.github/bin/smoke-test.sh
index 17dce0122..eaeb16b49 100755
--- a/.github/bin/smoke-test.sh
+++ b/.github/bin/smoke-test.sh
@@ -138,11 +138,11 @@ ExpectedFailCount[lint:ibex]=14
 ExpectedFailCount[project:ibex]=211
 ExpectedFailCount[preprocessor:ibex]=385
 
-ExpectedFailCount[syntax:opentitan]=65
-ExpectedFailCount[lint:opentitan]=65
-ExpectedFailCount[project:opentitan]=951
+ExpectedFailCount[syntax:opentitan]=70
+ExpectedFailCount[lint:opentitan]=70
+ExpectedFailCount[project:opentitan]=1001
 ExpectedFailCount[formatter:opentitan]=1
-ExpectedFailCount[preprocessor:opentitan]=2560
+ExpectedFailCount[preprocessor:opentitan]=2739
 
 ExpectedFailCount[syntax:sv-tests]=77
 ExpectedFailCount[lint:sv-tests]=76
@@ -211,11 +211,11 @@ ExpectedFailCount[preprocessor:scr1]=46
 ExpectedFailCount[project:serv]=1
 ExpectedFailCount[preprocessor:serv]=1
 
-ExpectedFailCount[syntax:basejump_stl]=481
-ExpectedFailCount[lint:basejump_stl]=481
-ExpectedFailCount[project:basejump_stl]=596
+ExpectedFailCount[syntax:basejump_stl]=482
+ExpectedFailCount[lint:basejump_stl]=482
+ExpectedFailCount[project:basejump_stl]=599
 ExpectedFailCount[formatter:basejump_stl]=1
-ExpectedFailCount[preprocessor:basejump_stl]=632
+ExpectedFailCount[preprocessor:basejump_stl]=635
 
 ExpectedFailCount[syntax:opl3_fpga]=3
 ExpectedFailCount[lint:opl3_fpga]=3

From 28264337c293bea5aafd1bb72adea7dee608f268 Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Sun, 12 Jan 2025 12:49:35 -0800
Subject: [PATCH 2/2] format: don't bazelbuild fix; compilation db: choose
 first bant.

---
 .github/bin/make-compilation-db.sh | 2 +-
 .github/bin/run-format.sh          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/bin/make-compilation-db.sh b/.github/bin/make-compilation-db.sh
index de58da3bb..ef89d7166 100755
--- a/.github/bin/make-compilation-db.sh
+++ b/.github/bin/make-compilation-db.sh
@@ -26,7 +26,7 @@ if [ "${BANT}" = "needs-to-be-compiled-locally" ]; then
   # the full realpath of the resulting binary to be immune to symbolic-link
   # switcharoo by bazel.
   ${BAZEL} build -c opt --cxxopt=-std=c++20 @bant//bant:bant >/dev/null 2>&1
-  BANT=$(realpath bazel-bin/external/bant*/bant/bant)
+  BANT=$(realpath bazel-bin/external/bant*/bant/bant | head -1)
 fi
 
 BAZEL_OPTS="-c opt --noshow_progress"
diff --git a/.github/bin/run-format.sh b/.github/bin/run-format.sh
index 13763d02a..24e97eeab 100755
--- a/.github/bin/run-format.sh
+++ b/.github/bin/run-format.sh
@@ -32,7 +32,8 @@ find . -name "*.h" -o -name "*.cc" \
 # If we have buildifier installed, use that to format BUILD files
 if command -v ${BUILDIFIER} >/dev/null; then
   echo "Run $(buildifier --version)"
-  ${BUILDIFIER} -lint=fix MODULE.bazel $(find . -name BUILD -o -name "*.bzl")
+  # TODO(hzeller): re-enable -lint=fix once compatible bazel version range again
+  ${BUILDIFIER} MODULE.bazel $(find . -name BUILD -o -name "*.bzl")
 fi
 
 # Check if we got any diff