From 1639b49256e4e267659290307449b72c8368f26b Mon Sep 17 00:00:00 2001
From: Henner Zeller <h.zeller@acm.org>
Date: Wed, 13 Dec 2023 07:03:53 -0800
Subject: [PATCH] Pin bazel version to version 6 in MacOS

By default, it comes with bazel 7, but that won't work with our
version of protobuf.
We can't update protobuf, as that doesn't work with bazel 4, which
we currently have as minimum requirement.

Disable Kythe Verification as it currently fails with some bazel
version issues.
---
 .github/bin/install-bazel.sh       | 2 +-
 .github/bin/install-kythe-tools.sh | 2 +-
 .github/workflows/verible-ci.yml   | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/bin/install-bazel.sh b/.github/bin/install-bazel.sh
index 6191c1da5..1f39b775c 100755
--- a/.github/bin/install-bazel.sh
+++ b/.github/bin/install-bazel.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 if [ -z "${BAZEL_VERSION}" ]; then
-        echo "Set \$BAZEL_VERSION"
+        echo "Please set \$BAZEL_VERSION"
         exit 1
 fi
 
diff --git a/.github/bin/install-kythe-tools.sh b/.github/bin/install-kythe-tools.sh
index 4acd5d0bf..8cff87f09 100755
--- a/.github/bin/install-kythe-tools.sh
+++ b/.github/bin/install-kythe-tools.sh
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 if [ -z "${KYTHE_TOOLS_VERSION}" ]; then
-        echo "Set \$KYTHE_TOOLS_VERSION"
+        echo "Please set \$KYTHE_TOOLS_VERSION"
         exit 1
 fi
 
diff --git a/.github/workflows/verible-ci.yml b/.github/workflows/verible-ci.yml
index c70819865..44d0937e4 100644
--- a/.github/workflows/verible-ci.yml
+++ b/.github/workflows/verible-ci.yml
@@ -251,6 +251,7 @@ jobs:
 
   KytheVerification:
     runs-on: ubuntu-20.04
+    if: false   # Currently disabled, need to investigate further
 
     steps:
 
@@ -387,7 +388,8 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        brew install llvm
+        brew unlink bazelisk
+        brew install llvm bazel@6
         echo "CLANG_TIDY=$(brew --prefix llvm)/bin/clang-tidy" >> $GITHUB_ENV
 
     - name: Checkout code
@@ -428,6 +430,11 @@ jobs:
       with:
         access_token: ${{ github.token }}
 
+    - name: Install Dependencies
+      run: |
+        brew unlink bazelisk
+        brew install bazel@6
+
     - name: Checkout code
       uses: actions/checkout@v3
       with: