Merge pull request #2045 from hzeller/20231213-fix-macos-bazel

Pin bazel version to version 6 in MacOS
chipsalliance · Dec 14, 2023 · 0d0696b · 0d0696b
2 parents 21917cc + 1639b49
commit 0d0696b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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: