Skip to content

Commit c2b2004

Browse files
committed
chore: upgrade to Bazel 7
Drops CI testing for Bazel 5, which we will soon stop supporting altogether. This is just to save CI resources, not because there's something broken with Bazel 5
1 parent 57c7b75 commit c2b2004

File tree

2 files changed

+13
-16
lines changed

2 files changed

+13
-16
lines changed

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
6.2.0
1+
7.0.0
22

33
# The first line of this file is used by Bazelisk and Bazel to be sure
44
# the right version of Bazel is used to build and test this repo.

.github/workflows/ci.yaml

+12-15
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v3
24-
- id: bazel_6
24+
- id: bazel_7
2525
run: echo "bazelversion=$(head -n 1 .bazelversion)" >> $GITHUB_OUTPUT
26-
- id: bazel_5
27-
run: echo "bazelversion=5.3.2" >> $GITHUB_OUTPUT
26+
- id: bazel_6
27+
run: echo "bazelversion=6.4.0" >> $GITHUB_OUTPUT
2828
outputs:
29-
# Will look like ["<version from .bazelversion>", "5.3.2"]
29+
# Will look like ["<version from .bazelversion>", "6.4.0"]
3030
bazelversions: ${{ toJSON(steps.*.outputs.bazelversion) }}
3131

3232
matrix-prep-os:
@@ -67,18 +67,15 @@ jobs:
6767
bzlmodEnabled: [true, false]
6868
exclude:
6969
# macos is expensive (billed at 10X) so don't test these
70-
- os: macos-latest
70+
- os: macos-latest
7171
folder: e2e/custom_registry
72-
- os: macos-latest
72+
- os: macos-latest
7373
folder: e2e/wasm
74-
- os: macos-latest
74+
- os: macos-latest
7575
folder: e2e/crane_as_registry
7676
- os: macos-latest
77-
bazelversion: 5.3.2
77+
bazelversion: 6.4.0
7878

79-
# Don't test bzlmod with Bazel 5 (not supported)
80-
- bazelversion: 5.3.2
81-
bzlmodEnabled: true
8279
# TODO: fix
8380
- folder: e2e/custom_registry
8481
bzlmodEnabled: true
@@ -116,9 +113,9 @@ jobs:
116113
if: ${{ matrix.os == 'macos-latest' }}
117114
uses: atomicjar/testcontainers-cloud-setup-action@main
118115
with:
119-
wait: true
120-
token: ${{ secrets.TC_CLOUD_TOKEN }}
121-
116+
wait: true
117+
token: ${{ secrets.TC_CLOUD_TOKEN }}
118+
122119
- name: Configure Remote Docker Host
123120
if: ${{ matrix.os == 'macos-latest' }}
124121
run: echo "DOCKER_HOST=$(grep 'tc.host' ~/.testcontainers.properties | cut -d '=' -f2 | xargs)" >> $GITHUB_ENV
@@ -129,7 +126,7 @@ jobs:
129126
# Bazelisk will download bazel to here, ensure it is cached between runs.
130127
XDG_CACHE_HOME: ~/.cache/bazel-repo
131128
run: bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc --bazelrc=.bazelrc test ${{ steps.set_bzlmod_flag.outputs.bzlmod_flag }} //...
132-
129+
133130
test-auth:
134131
runs-on: ubuntu-latest
135132
steps:

0 commit comments

Comments
 (0)