Skip to content

Commit 593b6d5

Browse files
Add Bazel 8 customizations (#2794)
Signed-off-by: Brentley Jones <[email protected]>
1 parent 45aa1e1 commit 593b6d5

File tree

5 files changed

+36
-3
lines changed

5 files changed

+36
-3
lines changed

bazel_8.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Disabled until bugs are fixed
2+
common --lockfile_mode=off
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
CONFIGURATION-STABLE-0 darwin_x86_64-dbg-ST-407e30105d50
2+
CONFIGURATION-STABLE-1 darwin_x86_64-dbg-ST-0cb41a45890d
3+
CONFIGURATION-STABLE-2 darwin_x86_64-opt-ST-3ebaaa60f9ea
4+
CONFIGURATION-STABLE-3 ios_x86_64-dbg-ios-x86_64-min15.0-applebin_ios-ST-ec26bca69b41
5+
CONFIGURATION-STABLE-4 watchos_x86_64-dbg-watchos-x86_64-min7.0-applebin_watchos-ST-1043e03348d6
6+
CONFIGURATION-STABLE-5 tvos_x86_64-dbg-tvos-x86_64-min15.0-applebin_tvos-ST-ce438f055cbb
7+
CONFIGURATION-STABLE-6 darwin_x86_64-dbg-macos-x86_64-min12.0-applebin_macos-ST-2def78e7184f
8+
CONFIGURATION-STABLE-7 ios_arm64-dbg-ios-arm64-min15.0-applebin_ios-ST-c30990658771
9+
CONFIGURATION-STABLE-8 watchos_arm64_32-dbg-watchos-arm64_32-min7.0-applebin_watchos-ST-fd2a96b3b11f
10+
CONFIGURATION-STABLE-9 tvos_arm64-dbg-tvos-arm64-min15.0-applebin_tvos-ST-7a5a862cb382
11+
CONFIGURATION-STABLE-10 ios_x86_64-opt-ios-x86_64-min15.0-applebin_ios-ST-2c9b4ecefc25
12+
CONFIGURATION-STABLE-11 watchos_x86_64-opt-watchos-x86_64-min7.0-applebin_watchos-ST-847c5b6a4329
13+
CONFIGURATION-STABLE-12 tvos_x86_64-opt-tvos-x86_64-min15.0-applebin_tvos-ST-85587bfa0dfc
14+
CONFIGURATION-STABLE-13 darwin_x86_64-opt-macos-x86_64-min12.0-applebin_macos-ST-5faa35951e87
15+
CONFIGURATION-STABLE-14 ios_arm64-opt-ios-arm64-min15.0-applebin_ios-ST-9a1a343abca6
16+
CONFIGURATION-STABLE-15 watchos_arm64_32-opt-watchos-arm64_32-min7.0-applebin_watchos-ST-64303a5eeb36
17+
CONFIGURATION-STABLE-16 tvos_arm64-opt-tvos-arm64-min15.0-applebin_tvos-ST-fe56c91186e8
18+
CONFIGURATION-STABLE-17 watchos_x86_64-dbg-watchos-x86_64-min8.0-applebin_watchos-ST-99e1c5fcd7e3
19+
CONFIGURATION-STABLE-18 watchos_arm64_32-dbg-watchos-arm64_32-min8.0-applebin_watchos-ST-9d3d8bec26be
20+
CONFIGURATION-STABLE-19 watchos_x86_64-opt-watchos-x86_64-min8.0-applebin_watchos-ST-0a19b84585db
21+
CONFIGURATION-STABLE-20 watchos_arm64_32-opt-watchos-arm64_32-min8.0-applebin_watchos-ST-f46b06ca0e7b
22+
CONFIGURATION-STABLE-21 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-12067848ee5c
23+
CONFIGURATION-STABLE-22 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-114572f286c3
24+
CONFIGURATION-STABLE-23 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-2fa98142772b
25+
CONFIGURATION-STABLE-24 darwin_arm64-dbg-macos-arm64-min11.0-applebin_macos-ST-17dc5fb9af4b
26+
CONFIGURATION-STABLE-25 darwin_x86_64-dbg-macos-x86_64-min11.0-applebin_macos-ST-67006a47c4ef
27+
CONFIGURATION-STABLE-26 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-007da2440a68
28+
CONFIGURATION-STABLE-27 darwin_arm64-opt-macos-arm64-min11.0-applebin_macos-ST-44db42dc8599
29+
CONFIGURATION-STABLE-28 darwin_x86_64-opt-macos-x86_64-min11.0-applebin_macos-ST-b46e9b013234
30+
CONFIGURATION-STABLE-29 darwin_x86_64-dbg-ST-e273d27b8a77
31+
CONFIGURATION-STABLE-30 darwin_x86_64-opt-ST-d92b73c84722

examples/integration/tools/bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ readonly override_bazelrc="$archive_output_base/override.bazelrc"
1010

1111
bazel_version=$("$BAZEL_REAL" info release | /usr/bin/cut -d ' ' -f 2 | /usr/bin/cut -d '.' -f 1)
1212
if [[ "$bazel_version" == "version" ]]; then
13-
bazel_version=7
13+
bazel_version=8
1414
fi
1515

1616
# Don't update the release archive if doing a build inside of Xcode, or if we

tools/bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ readonly workspace_dir="${tool_location%/*/*}"
77

88
bazel_version=$("$BAZEL_REAL" info release | /usr/bin/cut -d ' ' -f 2 | /usr/bin/cut -d '.' -f 1)
99
if [[ "$bazel_version" == "version" ]]; then
10-
bazel_version=7
10+
bazel_version=8
1111
fi
1212

1313
flags=("--noworkspace_rc")

xcodeproj/internal/templates/installer.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ if [[ $for_fixture -eq 1 ]]; then
105105
pushd "$BUILD_WORKSPACE_DIRECTORY"
106106
bazel_version=$("$bazel_path" info release | cut -d ' ' -f 2 | cut -d '.' -f 1)
107107
if [[ "$bazel_version" == "version" ]]; then
108-
bazel_version=7
108+
bazel_version=8
109109
fi
110110
popd
111111
readonly bazel_version_dir="$project_dir/bazel-$bazel_version"

0 commit comments

Comments
 (0)