Skip to content

Commit

Permalink
Pin bazel version to version 6 in MacOS
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
hzeller committed Dec 13, 2023
1 parent 060bde0 commit 1639b49
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/bin/install-bazel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/bin/install-kythe-tools.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/verible-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ jobs:

KytheVerification:
runs-on: ubuntu-20.04
if: false # Currently disabled, need to investigate further

steps:

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 1639b49

Please sign in to comment.