Skip to content

Commit e1f2d62

Browse files
authored
chore: bump Bazel from 5.2.0 to 6.5.0 (#402)
Bump Bazel from 5.2.0 to 6.5.0 This breaks the s390x build which relied on an external Docker image. I made some strides in fixing s390x, but it's not yet working. Deferred to #405. Signed-off-by: Martijn Stevenson <[email protected]>
1 parent 95e9982 commit e1f2d62

File tree

166 files changed

+251
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+251
-162
lines changed

.bazelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Disable Bzlmod
2+
common --noenable_bzlmod
3+
14
# Pass CC, CXX and PATH from the environment.
25
build --action_env=CC
36
build --action_env=CXX

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.2.0
1+
6.5.0

.github/workflows/test.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,8 @@ jobs:
251251
arch: s390x
252252
action: test
253253
flags: --config=clang --test_timeout=1800
254-
run_under: docker run --rm --env HOME=$HOME --env USER=$(id -un) --volume "$HOME:$HOME" --workdir $(pwd) --user $(id -u):$(id -g) --platform linux/s390x piotrsikora/build-tools:bazel-5.2.0-clang-14-gcc-12
254+
# s390x build-tools image built from bazel/external/Dockerfile.bazel
255+
run_under: docker run --rm --env HOME=$HOME --env USER=$(id -un) --volume "$HOME:$HOME" --workdir $(pwd) --user $(id -u):$(id -g) --platform linux/s390x ghcr.io/proxy-wasm/build-tools:ubuntu-20.04-bazel-6.5.0
255256
cache: true
256257
- name: 'Wasmtime on macOS/x86_64'
257258
engine: 'wasmtime'
@@ -282,6 +283,15 @@ jobs:
282283
if: ${{ matrix.deps != '' && startsWith(matrix.os, 'ubuntu') }}
283284
run: sudo apt update -y && sudo apt install -y ${{ matrix.deps }}
284285

286+
# Needed for s390x test which runs on a GHCR Docker Ubuntu image.
287+
- name: Login to GitHub Container Registry
288+
if: startsWith(matrix.run_under, 'docker')
289+
uses: docker/login-action@v3
290+
with:
291+
registry: ghcr.io
292+
username: ${{ github.actor }}
293+
password: ${{ secrets.GITHUB_TOKEN }}
294+
285295
- name: Activate Docker/QEMU
286296
if: startsWith(matrix.run_under, 'docker')
287297
run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

bazel/cargo/wasmsign/remote/BUILD.ansi_term-0.12.1.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run //bazel/cargo/wasmsign:crates_vendor
6+
# bazel run @//bazel/cargo/wasmsign:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

bazel/cargo/wasmsign/remote/BUILD.anyhow-1.0.86.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run //bazel/cargo/wasmsign:crates_vendor
6+
# bazel run @//bazel/cargo/wasmsign:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//cargo:defs.bzl", "cargo_build_script")

bazel/cargo/wasmsign/remote/BUILD.atty-0.2.14.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run //bazel/cargo/wasmsign:crates_vendor
6+
# bazel run @//bazel/cargo/wasmsign:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

bazel/cargo/wasmsign/remote/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run //bazel/cargo/wasmsign:crates_vendor
6+
# bazel run @//bazel/cargo/wasmsign:crates_vendor
77
###############################################################################
88

99
package(default_visibility = ["//visibility:public"])

bazel/cargo/wasmsign/remote/BUILD.bitflags-1.3.2.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run //bazel/cargo/wasmsign:crates_vendor
6+
# bazel run @//bazel/cargo/wasmsign:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

bazel/cargo/wasmsign/remote/BUILD.byteorder-1.5.0.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run //bazel/cargo/wasmsign:crates_vendor
6+
# bazel run @//bazel/cargo/wasmsign:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

bazel/cargo/wasmsign/remote/BUILD.cfg-if-1.0.0.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# DO NOT MODIFY: This file is auto-generated by a crate_universe tool. To
44
# regenerate this file, run the following:
55
#
6-
# bazel run //bazel/cargo/wasmsign:crates_vendor
6+
# bazel run @//bazel/cargo/wasmsign:crates_vendor
77
###############################################################################
88

99
load("@rules_rust//rust:defs.bzl", "rust_library")

0 commit comments

Comments
 (0)