Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 15 additions & 25 deletions .bazelci/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,43 +7,35 @@ buildifier:
# Keep this in sync with the list in .pre-commit-config.yaml
# https://github.com/bazelbuild/buildtools/issues/479 should fix this by giving us a config file
tasks:
ubuntu1804:
name: ubuntu1804
platform: ubuntu1804
ubuntu2204:
name: ubuntu2204
platform: ubuntu2204
build_targets:
- "//..."
test_flags:
- "--test_tag_filters=-skip-on-bazelci-ubuntu"
test_targets:
- "//..."
ubuntu1804-headers:
name: ubuntu1804-headers
platform: ubuntu1804
ubuntu2204-headers:
name: ubuntu2204-headers
platform: ubuntu2204
working_directory: "e2e/headers"
build_targets:
- "//..."
test_flags:
- "--test_tag_filters=-skip-on-bazelci-ubuntu"
test_targets:
- "//..."
ubuntu1804-smoke:
name: ubuntu1804-smoke
platform: ubuntu1804
ubuntu2204-smoke:
name: ubuntu2204-smoke
platform: ubuntu2204
working_directory: "e2e/smoke"
build_targets:
- "//..."
test_flags:
- "--test_tag_filters=-skip-on-bazelci-ubuntu"
test_targets:
- "//..."
ubuntu1804-nodejs_host:
name: ubuntu1804-nodejs_host
platform: ubuntu1804
ubuntu2204-nodejs_host:
name: ubuntu2204-nodejs_host
platform: ubuntu2204
working_directory: "e2e/nodejs_host"
build_targets:
- "//..."
test_flags:
- "--test_tag_filters=-skip-on-bazelci-ubuntu"
test_targets:
- "//..."
macos:
Expand Down Expand Up @@ -91,13 +83,11 @@ tasks:
working_directory: "e2e/nodejs_host"
build_targets:
- "//..."
test_flags:
- "--test_tag_filters=-skip-on-bazelci-windows"
test_targets:
- "//..."
rbe_ubuntu1604-smoke:
name: rbe_ubuntu1604-smoke
platform: rbe_ubuntu1604
rbe_ubuntu2204-smoke:
name: rbe_ubuntu2204-smoke
platform: rbe_ubuntu2204
working_directory: "e2e/smoke"
build_targets:
- "//..."
Expand Down
17 changes: 7 additions & 10 deletions e2e/nodejs_host/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -48,24 +48,21 @@
"@%s//:node" % node_toolchain,
"@bazel_tools//tools/bash/runfiles",
],
tags = tags,
)
for (node_toolchain, tool, tags) in [
for (node_toolchain, tool) in [
(
"nodejs",
"npm",
["skip-on-bazelci-ubuntu"], # fails on Bazel CI Ubuntu on latest Node.js due to GLIBC version on runner: "GLIBC_2.28 not found" (https://buildkite.com/bazel/rules-nodejs-nodejs/builds/13451#018feffd-4878-46e4-8582-ae94648a2d74)
),
(
"nodejs",
"npx",
["skip-on-bazelci-ubuntu"], # fails on Bazel CI Ubuntu on latest Node.js due to GLIBC version on runner: "GLIBC_2.28 not found" (https://buildkite.com/bazel/rules-nodejs-nodejs/builds/13451#018feffd-4878-46e4-8582-ae94648a2d74)
),
("node16", "npm", []),
("node16", "npx", []),
("node16_nvmrc", "npm", []),
("node16_nvmrc", "npx", []),
("node17_custom", "npm", []),
("node17_custom", "npx", []),
("node16", "npm"),
("node16", "npx"),
("node16_nvmrc", "npm"),
("node16_nvmrc", "npx"),
("node17_custom", "npm"),
("node17_custom", "npx"),
]
]
4 changes: 2 additions & 2 deletions e2e/smoke/WORKSPACE.bzlmod
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ http_archive(
load("@bazelci_rules//:rbe_repo.bzl", "rbe_preconfig")

# Creates toolchain configuration for remote execution with BuildKite CI
# for rbe_ubuntu1604
# for rbe_ubuntu2204
rbe_preconfig(
name = "buildkite_config",
toolchain = "ubuntu1804-bazel-java11",
toolchain = "ubuntu2204",
)
Loading