Skip to content

Commit df5e545

Browse files
committed
Use Bazelisk and update to Bazel 7.4.0
1 parent 6919531 commit df5e545

File tree

13 files changed

+26
-184
lines changed

13 files changed

+26
-184
lines changed

.bazelrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
common --config=rules
2-
common:v7.2 --config=rules_v7.2
31
import %workspace%/.bazelrc_shared

.bazelrc_shared

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,3 @@ test --test_output=all
2222

2323
build:rules --disk_cache=.bazel_cache
2424
build:tests --disk_cache=../.bazel_cache
25-
26-
common:rules_v7.2 --config=noop
27-
28-
# route potentially unrouted configs to a terminating noop config
29-
# it's a noop because we use the default value
30-
common:rules --config=noop
31-
common:tests --config=noop
32-
common:v7.2 --config=rules_v7.2
33-
34-
# pick something trivial as a "noop"
35-
common:noop --logging=3

.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
7.4.0

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: [ubuntu-24.04]
17-
bazel_version: [7.2.0]
17+
bazel_version: [bazelbuild/7.4.0]
1818
steps:
1919
- uses: actions/checkout@v3
20+
- uses: bazel-contrib/[email protected]
21+
with:
22+
bazelisk-version: 1.22.1
2023
- run: ./scripts/ci.sh build
2124
- run: ./scripts/ci.sh lint
2225
- run: ./scripts/ci.sh test

MODULE.bazel.lock

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rules/scala/workspace.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def scala_artifacts():
5050
]
5151

5252
def scala_repositories(
53-
java_launcher_version = "7.2.0",
53+
java_launcher_version = "7.4.0",
5454
java_launcher_template_sha = "ee4aa47ae5e639632c67be5cc0ccbc4e941a67a1b884a1ce0c4329357a4b62b2"):
5555
maven_install(
5656
name = "annex",

scripts/ci.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
set -eox pipefail
88
cd "$(dirname "$0")/.."
99

10-
. ./scripts/prepare-path.sh --force
11-
1210
case "$1" in
1311

1412
"build")

scripts/format.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
set -o pipefail
88
cd "$(dirname "$0")/.."
99

10-
. ./scripts/prepare-path.sh --force
11-
1210
if [ "$1" != check ]; then
1311
bazel build $(bazel query 'kind("scala_format_test", //...)')
1412
bazel query 'kind("scala_format_test", //...)' --output package | while read package; do bazel-bin/"$package"/*-format .; done

scripts/prepare-path.sh

Lines changed: 0 additions & 38 deletions
This file was deleted.

scripts/test.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
set -o pipefail
88
cd "$(dirname "$0")/.."
99

10-
. ./scripts/prepare-path.sh --force
11-
1210
find tests -name test -type f | sort | while read f; do
1311
echo running ${f#"tests/"}...
1412
output=$($f 2>&1) || ( echo "$output" && exit 1 )

0 commit comments

Comments
 (0)