Skip to content

tests: fix typescript isolation, japicmp, cloudflare and oci verify on Linux #9762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TrapsterDK merged 1 commit into from
Nov 9, 2026
Merged

tests: fix typescript isolation, japicmp, cloudflare and oci verify on Linux #9762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions deploy/rules/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ rust_test(
"DX_TEST_RUSTC": "$(rlocationpath @rules_rust//rust/toolchain:current_rustc_files)",
"DX_TEST_RUSTDOC": "$(rlocationpath @rules_rust//rust/toolchain:current_rustdoc_files)",
"JAPICMP_JAR": "$(rlocationpath //deploy/rules/pins:japicmp)",
"MAVEN_API_JAVA": "$(JAVA_ROOTPATH)",
"MAVEN_API_JAVA": "$(rlocationpaths @rules_java//toolchains:current_java_runtime)",
"MAVEN_API_NEW_JAR": "$(rlocationpath :maven_api_new_lib)",
"MAVEN_API_OLD_JAR": "$(rlocationpath :maven_api_old_lib)",
"MAVEN_DEMO_JAR": "$(rlocationpath :maven_demo_lib)",
Expand All @@ -313,7 +313,6 @@ rust_test(
"MAVEN_GNUPG_PUBKEY": "$(rlocationpath testdata/maven/gnupg/pubkey.asc)",
"MAVEN_GNUPG_SIGNATURE": "$(rlocationpath testdata/maven/gnupg/payload.txt.asc)",
},
toolchains = ["@rules_java//toolchains:current_java_runtime"],
deps = all_crate_deps(
package_name = "deploy/dx_deploy_tools",
normal = True,
Expand Down Expand Up @@ -1981,6 +1980,7 @@ oci_deploy(
name = "oci_demo",
image_tar = ":oci_demo_tar",
platform = "//deploy/rules/platforms:linux_amd64",
scan = "off",
)

image_unit_tests(name = "image_unit")
Expand All @@ -2005,6 +2005,7 @@ oci_deploy(
name = "oci_demo_layout",
image_tar = ":oci_demo_layout_dir",
platform = "//deploy/rules/platforms:linux_amd64",
scan = "off",
)

deploy_analysis_test(
Expand Down
6 changes: 5 additions & 1 deletion deploy/rules/src/maven.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,11 @@ pub(crate) mod tests {
let rloc = std::env::var(name).expect(name);
resolve_runfile(&rloc).expect(name)
};
let java = resolve_runfile(java.trim_start_matches("../")).expect("java");
let java = java
.split_whitespace()
.find(|path| path.ends_with("/bin/java"))
.expect("the runtime lists bin/java");
let java = resolve_runfile(java).expect("java");
let japicmp = resolve("JAPICMP_JAR");
let old_jar = std::fs::read(resolve("MAVEN_API_OLD_JAR")).expect("old jar");
let new_jar = resolve("MAVEN_API_NEW_JAR");
Expand Down
2 changes: 1 addition & 1 deletion deploy/rules/verify_test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ fn cloudflare_case() {
.expect("missing token run must execute");
assert!(!missing.status.success());
assert!(
missing.stderr.contains("CLOUDFLARE_API_TOKEN is not set"),
missing.stderr.contains("live upload needs CLOUDFLARE_API_TOKEN"),
"{}",
missing.stderr
);
Expand Down
4 changes: 2 additions & 2 deletions tools/docs/typescript/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ rust_test(
data = [
"//tools/docs/typescript/fixture/hostile:hostile_control_base",
"//tools/docs/typescript/fixture/hostile:hostile_control_package",
"//tools/docs/typescript/fixture/hostile:hostile_control_tsconfig",
"//tools/docs/typescript/fixture/hostile:hostile_control_tsconfig.typedoc.json",
"//tools/docs/typescript/fixture/hostile:hostile_docs",
"//tools/docs/typescript/fixture/hostile:hostile_docs.typedoc.json",
],
env = {
"DX_HOSTILE_CONTROL_BASE": "$(rootpath //tools/docs/typescript/fixture/hostile:hostile_control_base)",
"DX_HOSTILE_CONTROL_PACKAGE": "$(rootpath //tools/docs/typescript/fixture/hostile:hostile_control_package)",
"DX_HOSTILE_CONTROL_TSCONFIG": "$(rootpath //tools/docs/typescript/fixture/hostile:hostile_control_tsconfig)",
"DX_HOSTILE_CONTROL_TSCONFIG": "$(rootpath //tools/docs/typescript/fixture/hostile:hostile_control_tsconfig.typedoc.json)",
"DX_HOSTILE_SHARD": "$(rootpath //tools/docs/typescript/fixture/hostile:hostile_docs)",
"DX_HOSTILE_TYPEDOC": "$(rootpath //tools/docs/typescript/fixture/hostile:hostile_docs.typedoc.json)",
},
Expand Down
3 changes: 2 additions & 1 deletion tools/docs/typescript/fixture/hostile/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ typescript_doc_shard(
srcs = _SRCS + [
"tsconfig.json",
],
out_dirs = ["hostile_control_html"] if marker == "tsconfig" else [],
outs = ["hostile_control_" + marker + ".typedoc.json"],
args = [
"--tsconfig",
Expand All @@ -41,7 +42,7 @@ typescript_doc_shard(
"src/index.ts",
"--json",
"hostile_control_" + marker + ".typedoc.json",
],
] + (["--out", "hostile_control_html"] if marker == "tsconfig" else []),
chdir = package_name(),
mnemonic = "DxTypedocControl",
tool = "//quality/tools/javascript/bin:typedoc_stock",
Expand Down
Loading