Skip to content

Commit

Permalink
chore: test against bazel 7.0.0 (#713)
Browse files Browse the repository at this point in the history
(cherry picked from commit 5aaa785)
  • Loading branch information
gregmagolan authored and thesayyn committed Mar 27, 2024
1 parent 6f22724 commit 94d3993
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,8 @@ jobs:
run: echo "bazelversion=$(head -n 1 .bazelversion)" >> $GITHUB_OUTPUT
- id: bazel_7
run: echo "bazelversion=7.0.0" >> $GITHUB_OUTPUT
- id: bazel_5
run: echo "bazelversion=5.4.1" >> $GITHUB_OUTPUT
outputs:
# Will look like '["<version from .bazelversion>", "7.0.0", "5.4.1"]'
# Will look like '["<version from .bazelversion>", "7.0.0"]'
bazelversions: ${{ toJSON(steps.*.outputs.bazelversion) }}

matrix-prep-os:
Expand Down
7 changes: 7 additions & 0 deletions internal_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,13 @@ def bazel_lib_internal_deps():
url = "https:/bazel-contrib/bazel_features/releases/download/v0.1.0/bazel_features-v0.1.0.tar.gz",
)

http_archive(
name = "bazel_features",
sha256 = "f3082bfcdca73dc77dcd68faace806135a2e08c230b02b1d9fbdbd7db9d9c450",
strip_prefix = "bazel_features-0.1.0",
url = "https:/bazel-contrib/bazel_features/releases/download/v0.1.0/bazel_features-v0.1.0.tar.gz",
)

# Register toolchains for tests
register_jq_toolchains()
register_yq_toolchains()
Expand Down
3 changes: 2 additions & 1 deletion lib/private/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("//lib/private:utils.bzl", "utils")

exports_files(
[
Expand Down Expand Up @@ -218,7 +219,7 @@ bzl_library(
deps = [
"@bazel_tools//tools/build_defs/repo:http.bzl",
"@bazel_tools//tools/build_defs/repo:utils.bzl",
],
] + (["@bazel_tools//tools/build_defs/repo:cache.bzl"] if utils.is_bazel_7_or_greater() else []),
)

# keep
Expand Down
2 changes: 1 addition & 1 deletion tools/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ exports_files([
bzl_library(
name = "integrity",
srcs = [":integrity.bzl"],
visibility = ["//lib/private/docs:__pkg__"],
visibility = ["//visibility:public"],
)

bzl_library(
Expand Down

0 comments on commit 94d3993

Please sign in to comment.