From 1fb10270360e3360a61d19289b967f106f510d17 Mon Sep 17 00:00:00 2001 From: Ezekiel Warren Date: Thu, 14 Dec 2023 00:16:11 -0800 Subject: [PATCH] build system: use env var for bazel version in CI (#1098) --- .bazeliskrc | 1 + .bazelversion | 1 - .github/workflows/bazel.yml | 2 ++ WORKSPACE | 0 WORKSPACE.bazel | 1 + 5 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .bazeliskrc delete mode 100644 .bazelversion create mode 100644 WORKSPACE diff --git a/.bazeliskrc b/.bazeliskrc new file mode 100644 index 000000000..773a4f4c6 --- /dev/null +++ b/.bazeliskrc @@ -0,0 +1 @@ +USE_BAZEL_VERSION=6.x diff --git a/.bazelversion b/.bazelversion deleted file mode 100644 index f9da12e11..000000000 --- a/.bazelversion +++ /dev/null @@ -1 +0,0 @@ -6.3.2 \ No newline at end of file diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index 61f5861f5..64ede07d1 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -16,3 +16,5 @@ jobs: - uses: actions/checkout@v4 - run: bazelisk test --config=ci ... working-directory: test + env: + USE_BAZEL_VERSION: 6.x diff --git a/WORKSPACE b/WORKSPACE new file mode 100644 index 000000000..e69de29bb diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel index e69de29bb..600260da4 100644 --- a/WORKSPACE.bazel +++ b/WORKSPACE.bazel @@ -0,0 +1 @@ +# SEE MODULE.bazel