Skip to content

Commit c3153f8

Browse files
erock2112SkCQ
authored andcommitted
Revert "[bazel] Update to 7.7.0"
This reverts commit 7ee17ce. Reason for revert: Louhi failing Original change's description: > [bazel] Update to 7.7.0 > > First step in migration to bzlmod. > > Bug: b/458681039 > Change-Id: I35b041e14b157e5715da300a3da9f6f68999bfa2 > Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/1095717 > Reviewed-by: Kaylee Lubick <[email protected]> > Commit-Queue: Eric Boren <[email protected]> Bug: b/458681039 No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I1c6fd6c3aa8233f6ed5b0479c1b6816e54e4b65f Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/1099576 Bot-Commit: Rubber Stamper <[email protected]> Auto-Submit: Eric Boren <[email protected]> Commit-Queue: Rubber Stamper <[email protected]>
1 parent 66285e1 commit c3153f8

34 files changed

+4951
-11456
lines changed

.bazelversion

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

.eslintrc.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = {
1616
},
1717
parser: '@typescript-eslint/parser',
1818
parserOptions: {
19-
ecmaVersion: 11,
19+
ecmaVersion: 2018,
2020
sourceType: 'module',
2121
},
2222
ignorePatterns: ['dist/', 'build/', '_bazel*', 'new_element/templates/'],
@@ -143,7 +143,7 @@ module.exports = {
143143
rules: {
144144
// Prevents Chai.js assertions such as expect(foo).to.be.true from causing "Expected an
145145
// assignment or function call and instead saw an expression." linting errors.
146-
'@typescript-eslint/no-unused-expressions': 'off',
146+
'no-unused-expressions': 'off',
147147
},
148148
},
149149
],

.puppeteerrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ module.exports = {
55
// By default, Puppeteer downloads Chrome to ~/.cache/puppeteer as a post-install step (see
66
// https://pptr.dev/guides/configuration). This non-hermetic behavior does not play well with
77
// Bazel. Instead, we disable it, and we hermetically download Chrome ourselves via the
8+
// //puppeteer-tests:chrome Bazel target.
89
skipDownload: true,
910
};

BUILD.bazel

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
44
load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
55
load("@exec_properties//:constants.bzl", "NETWORK_ON")
66
load("@npm//:defs.bzl", "npm_link_all_packages")
7-
load(":puppeteerrc.bzl", "puppeteerrc_js")
87

98
# Disable generation of go_proto_library targets. Let Gazelle use checked-in .pb.go files instead.
109
#
@@ -309,14 +308,3 @@ alias(
309308
actual = "@rbe_configs_gen_linux_amd64//file:rbe_configs_gen",
310309
visibility = ["//visibility:public"],
311310
)
312-
313-
#############################################################
314-
# Create puppeteer.js that points to the downloaded Chrome. #
315-
#############################################################
316-
317-
puppeteerrc_js(
318-
name = "puppeteerrc_js_expanded",
319-
template = "puppeteerrc.js.tpl",
320-
toolchains = ["@rules_browsers//browsers/chromium:toolchain_alias"],
321-
visibility = ["//visibility:public"],
322-
)

MODULE.bazel

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

MODULE.bazel.lock

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

WORKSPACE

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,99 @@ http_archive(
231231
),
232232
)
233233

234+
#############
235+
# rules_js. #
236+
#############
237+
238+
http_archive(
239+
name = "aspect_rules_js",
240+
sha256 = "76a04ef2120ee00231d85d1ff012ede23963733339ad8db81f590791a031f643",
241+
strip_prefix = "rules_js-1.34.1",
242+
urls = gcs_mirror_url(
243+
sha256 = "76a04ef2120ee00231d85d1ff012ede23963733339ad8db81f590791a031f643",
244+
url = "https://github.com/aspect-build/rules_js/releases/download/v1.34.1/rules_js-v1.34.1.tar.gz",
245+
),
246+
)
247+
248+
load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
249+
250+
rules_js_dependencies()
251+
252+
load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
253+
254+
nodejs_register_toolchains(
255+
name = "nodejs",
256+
node_version = "18.17.0",
257+
)
258+
259+
load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
260+
261+
# See https://docs.aspect.build/rulesets/aspect_rules_js/docs/pnpm to learn about how the rules_js
262+
# ruleset uses the //pnpm-lock.yaml, //package.json and //package-lock.json files.
263+
#
264+
# See also: https://docs.aspect.build/rulesets/aspect_rules_js/docs/npm_translate_lock/.
265+
npm_translate_lock(
266+
name = "npm",
267+
data = [
268+
"//:package.json",
269+
],
270+
npm_package_lock = "//:package-lock.json",
271+
npmrc = "//:.npmrc",
272+
pnpm_lock = "//:pnpm-lock.yaml",
273+
update_pnpm_lock = False,
274+
verify_node_modules_ignored = "//:.bazelignore",
275+
)
276+
277+
load("@npm//:repositories.bzl", "npm_repositories")
278+
279+
npm_repositories()
280+
281+
#############
282+
# rules_ts. #
283+
#############
284+
285+
http_archive(
286+
name = "aspect_rules_ts",
287+
sha256 = "bd3e7b17e677d2b8ba1bac3862f0f238ab16edb3e43fb0f0b9308649ea58a2ad",
288+
strip_prefix = "rules_ts-2.1.0",
289+
urls = gcs_mirror_url(
290+
sha256 = "bd3e7b17e677d2b8ba1bac3862f0f238ab16edb3e43fb0f0b9308649ea58a2ad",
291+
url = "https://github.com/aspect-build/rules_ts/releases/download/v2.1.0/rules_ts-v2.1.0.tar.gz",
292+
),
293+
)
294+
295+
load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies")
296+
297+
rules_ts_dependencies(
298+
# This keeps the TypeScript version in-sync with the editor, which is typically best.
299+
ts_version_from = "//:package.json",
300+
)
301+
302+
##################
303+
# rules_esbuild. #
304+
##################
305+
306+
http_archive(
307+
name = "aspect_rules_esbuild",
308+
sha256 = "46aab76044f040c1c0bd97672d56324619af4913cb9e96606ec37ddd4605831d",
309+
strip_prefix = "rules_esbuild-0.16.0",
310+
urls = gcs_mirror_url(
311+
sha256 = "46aab76044f040c1c0bd97672d56324619af4913cb9e96606ec37ddd4605831d",
312+
url = "https://github.com/aspect-build/rules_esbuild/releases/download/v0.16.0/rules_esbuild-v0.16.0.tar.gz",
313+
),
314+
)
315+
316+
load("@aspect_rules_esbuild//esbuild:dependencies.bzl", "rules_esbuild_dependencies")
317+
318+
rules_esbuild_dependencies()
319+
320+
load("@aspect_rules_esbuild//esbuild:repositories.bzl", "LATEST_ESBUILD_VERSION", "esbuild_register_toolchains")
321+
322+
esbuild_register_toolchains(
323+
name = "esbuild",
324+
esbuild_version = LATEST_ESBUILD_VERSION,
325+
)
326+
234327
########################################################
235328
# rules_pkg, required by the skia_app_container macro. #
236329
########################################################

bazel/rbe/generated/cc/BUILD

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,6 @@ package(default_visibility = ["//visibility:public"])
2222

2323
licenses(["notice"]) # Apache 2.0
2424

25-
cc_library(name = "empty_lib")
26-
27-
# Label flag for extra libraries to be linked into every binary.
28-
# TODO(bazel-team): Support passing flag multiple times to build a list.
29-
label_flag(
30-
name = "link_extra_libs",
31-
build_setting_default = ":empty_lib",
32-
)
33-
34-
# The final extra library to be linked into every binary target. This collects
35-
# the above flag, but may also include more libraries depending on config.
36-
cc_library(
37-
name = "link_extra_lib",
38-
deps = [
39-
":link_extra_libs",
40-
],
41-
)
42-
4325
cc_library(
4426
name = "malloc",
4527
)
@@ -54,16 +36,9 @@ filegroup(
5436
srcs = ["cc_wrapper.sh"],
5537
)
5638

57-
filegroup(
58-
name = "validate_static_library",
59-
srcs = ["validate_static_library.sh"],
60-
)
61-
6239
filegroup(
6340
name = "compiler_deps",
64-
srcs = glob(["extra_tools/**"], allow_empty = True) + [":builtin_include_directory_paths",
65-
":cc_wrapper",
66-
":validate_static_library"],
41+
srcs = glob(["extra_tools/**"], allow_empty = True) + [":builtin_include_directory_paths"],
6742
)
6843

6944
# This is the entry point for --crosstool_top. Toolchains are found
@@ -91,7 +66,6 @@ cc_toolchain(
9166
linker_files = ":compiler_deps",
9267
objcopy_files = ":empty",
9368
strip_files = ":empty",
94-
supports_header_parsing = 1,
9569
supports_param_files = 1,
9670
module_map = ":module.modulemap",
9771
)
@@ -113,8 +87,7 @@ cc_toolchain_config(
11387
"/usr/lib/llvm-14/lib/clang/14.0.6/share",
11488
"/usr/include/c++/12",
11589
"/usr/include/x86_64-linux-gnu/c++/12",
116-
"/usr/include/c++/12/backward",
117-
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"],
90+
"/usr/include/c++/12/backward"],
11891
tool_paths = {"ar": "/usr/bin/ar",
11992
"ld": "/usr/bin/ld",
12093
"llvm-cov": "None",
@@ -126,10 +99,7 @@ cc_toolchain_config(
12699
"nm": "/usr/bin/nm",
127100
"objcopy": "/usr/bin/objcopy",
128101
"objdump": "/usr/bin/objdump",
129-
"strip": "/usr/bin/strip",
130-
"c++filt": "/usr/bin/c++filt",
131-
"parse_headers": "cc_wrapper.sh",
132-
"validate_static_library": "validate_static_library.sh"},
102+
"strip": "/usr/bin/strip"},
133103
compile_flags = ["-fstack-protector",
134104
"-Wall",
135105
"-Wthread-safety",
@@ -145,18 +115,13 @@ cc_toolchain_config(
145115
"-ffunction-sections",
146116
"-fdata-sections"],
147117
dbg_compile_flags = ["-g"],
148-
conly_flags = [],
149118
cxx_flags = ["-std=c++14"],
150119
link_flags = ["-fuse-ld=/usr/bin/ld.gold",
151-
"-B/usr/lib/llvm-14/bin",
152120
"-Wl,-no-as-needed",
153-
"-Wl,-z,relro,-z,now"],
154-
link_libs = ["-Wl,--push-state,-as-needed",
155-
"-lstdc++",
156-
"-Wl,--pop-state",
157-
"-Wl,--push-state,-as-needed",
158-
"-lm",
159-
"-Wl,--pop-state"],
121+
"-Wl,-z,relro,-z,now",
122+
"-B/usr/lib/llvm-14/bin"],
123+
link_libs = ["-lstdc++",
124+
"-lm"],
160125
opt_link_flags = ["-Wl,--gc-sections"],
161126
unfiltered_compile_flags = ["-no-canonical-prefixes",
162127
"-Wno-builtin-macro-redefined",
@@ -166,7 +131,6 @@ cc_toolchain_config(
166131
coverage_compile_flags = ["--coverage"],
167132
coverage_link_flags = ["--coverage"],
168133
supports_start_end_lib = True,
169-
extra_flags_per_feature = {"use_module_maps": ["-Xclang", "-fno-cxx-modules"]},
170134
)
171135

172136
# Android tooling requires a default toolchain for the armeabi-v7a cpu.

bazel/rbe/generated/cc/REPO.bazel

Whitespace-only changes.

bazel/rbe/generated/cc/WORKSPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# DO NOT EDIT: automatically generated WORKSPACE file for cc_autoconf rule
2+
workspace(name = "local_config_cc")

0 commit comments

Comments
 (0)