Skip to content

Commit f9b8d90

Browse files
UebelAndreUebelAndre
authored
Fix reproducible warning in crates_repository (#3904)
This fixes a noisy warning for users of `crates_repository`: ``` DEBUG: Rule 'crate_index' indicated that a canonical reproducible form can be obtained by nodifying arguments _action_listener = <unknown object com.google.devtools.build.lib.packages.Attribute$LabelListLateBoundDefault>, _config_dependencies = [], _configure = False, _original_name = "" ```
1 parent 76abd40 commit f9b8d90

100 files changed

Lines changed: 14930 additions & 3 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/determinism.yaml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
name: Determinism
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
types: [opened, synchronize]
7+
paths:
8+
- test/determinism/**
9+
10+
jobs:
11+
check:
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
include:
16+
- os: macos-latest
17+
work_dir: ${{ env.RUNNER_TEMP }}/r
18+
- os: ubuntu-latest
19+
work_dir: ${{ env.RUNNER_TEMP }}/r
20+
- os: windows-latest
21+
work_dir: C:\r
22+
23+
runs-on: ${{ matrix.os }}
24+
name: Check (${{ matrix.os }})
25+
26+
steps:
27+
- uses: actions/checkout@v4
28+
with:
29+
clean: true
30+
31+
- name: Run tests
32+
continue-on-error: true
33+
run: |
34+
bazel run \
35+
--compilation_mode=opt \
36+
//test/determinism:tester \
37+
-- test \
38+
--output="${{ github.workspace }}/results.json" \
39+
--work-dir="${{ matrix.work_dir }}"
40+
41+
- name: Summarize (unix)
42+
if: runner.os != 'Windows'
43+
shell: bash
44+
run: |
45+
if [[ ! -f results.json ]]; then
46+
exit 1
47+
fi
48+
49+
{
50+
echo '<details>'
51+
echo
52+
echo '```json'
53+
cat results.json
54+
echo
55+
echo '```'
56+
echo
57+
echo '</details>'
58+
} >> "$GITHUB_STEP_SUMMARY"
59+
60+
if [[ "$(cat results.json)" != "[]"* ]]; then
61+
exit 1
62+
fi
63+
64+
- name: Summarize (windows)
65+
if: runner.os == 'Windows'
66+
shell: pwsh
67+
run: |
68+
if (-not (Test-Path results.json)) { exit 1 }
69+
70+
Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '<details>'
71+
Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value ''
72+
Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '```json'
73+
Get-Content -Path results.json | Add-Content -Path $env:GITHUB_STEP_SUMMARY
74+
Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value ''
75+
Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '```'
76+
Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value ''
77+
Add-Content -Path $env:GITHUB_STEP_SUMMARY -Value '</details>'
78+
79+
$content = Get-Content -Path results.json -Raw
80+
if (-not $content.StartsWith('[]')) { exit 1 }
81+
82+
- name: Archive output base (unix)
83+
if: runner.os != 'Windows' && always()
84+
shell: bash
85+
run: |
86+
if [[ -d "${{ matrix.work_dir }}/o" ]]; then
87+
tar -czf output-base.tar.gz -C "${{ matrix.work_dir }}" o
88+
fi
89+
90+
- name: Archive output base (windows)
91+
if: runner.os == 'Windows' && always()
92+
shell: pwsh
93+
run: |
94+
if (Test-Path "${{ matrix.work_dir }}\o") {
95+
Compress-Archive -Path "${{ matrix.work_dir }}\o" -DestinationPath output-base.zip
96+
}
97+
98+
- name: Upload output base artifact
99+
if: always()
100+
uses: actions/upload-artifact@v4
101+
with:
102+
name: output-base-${{ matrix.os }}
103+
path: |
104+
output-base.tar.gz
105+
output-base.zip
106+
if-no-files-found: ignore

‎MODULE.bazel‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,17 @@ use_repo(
6666
"buildkite_config",
6767
"generated_inputs_in_external_repo",
6868
"libc",
69+
"rrtd",
70+
"rrtd__anyhow-1.0.100",
71+
"rrtd__blake3-1.8.2",
72+
"rrtd__clap-4.5.50",
73+
"rrtd__serde-1.0.228",
74+
"rrtd__serde_json-1.0.145",
75+
"rrtd__tempfile-3.23.0",
76+
"rrtd__tokio-1.48.0",
77+
"rrtd__tracing-0.1.41",
78+
"rrtd__tracing-subscriber-0.3.20",
79+
"rrtd__walkdir-2.5.0",
6980
"rtra",
7081
"rtra__serde-1.0.228",
7182
"rtra__serde_json-1.0.149",

‎crate_universe/private/crates_repository.bzl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,9 @@ def _crates_repository_impl(repository_ctx):
139139
# Determine the set of reproducible values
140140
attrs = {attr: getattr(repository_ctx.attr, attr) for attr in dir(repository_ctx.attr)}
141141
exclude = ["to_json", "to_proto"]
142-
for attr in exclude:
143-
attrs.pop(attr, None)
142+
for attr in list(attrs.keys()):
143+
if attr in exclude or attr.startswith("_"):
144+
attrs.pop(attr, None)
144145

145146
# Note that this is only scoped to the current host platform. Users should
146147
# ensure they provide all the values necessary for the host environments

‎test/cargo_build_script/compile_data/test.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
pub fn test_compile_data() {
33
let data = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/", env!("DATA")));
44

5-
assert_eq!("La-Li-Lu-Le-Lo\n", data);
5+
assert_eq!("La-Li-Lu-Le-Lo", data.trim());
66
}

‎test/deps.bzl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
44
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
5+
load("//test/determinism/3rdparty/crates:crates.bzl", determinism_test_crate_repositories = "crate_repositories")
56
load("//test/generated_inputs:external_repo.bzl", "generated_inputs_in_external_repo")
67
load("//test/load_arbitrary_tool:load_arbitrary_tool_test.bzl", "load_arbitrary_tool_test")
78
load("//test/rust_analyzer/3rdparty/crates:crates.bzl", rust_analyzer_test_crate_repositories = "crate_repositories")
@@ -42,6 +43,7 @@ def rules_rust_test_deps(is_bzlmod = False):
4243
direct_deps.extend(generated_inputs_in_external_repo())
4344
direct_deps.extend(rust_analyzer_test_crate_repositories())
4445
direct_deps.extend(vscode_test_crate_repositories())
46+
direct_deps.extend(determinism_test_crate_repositories())
4547

4648
maybe(
4749
http_archive,

‎test/determinism/3rdparty/BUILD.bazel‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
load("//crate_universe:defs.bzl", "crate", "crates_vendor")
2+
3+
crates_vendor(
4+
name = "crates_vendor",
5+
cargo_lockfile = "Cargo.Bazel.lock",
6+
mode = "remote",
7+
packages = {
8+
"anyhow": crate.spec(version = "1.0.97"),
9+
"blake3": crate.spec(version = "1.6.1"),
10+
"clap": crate.spec(
11+
features = [
12+
"derive",
13+
"env",
14+
],
15+
version = "4.5.32",
16+
),
17+
"serde": crate.spec(
18+
features = ["derive"],
19+
version = "1.0.219",
20+
),
21+
"serde_json": crate.spec(version = "1.0.140"),
22+
"tempfile": crate.spec(version = "3.19.0"),
23+
"tokio": crate.spec(
24+
features = ["full"],
25+
version = "1.44.1",
26+
),
27+
"tracing": crate.spec(version = "0.1.41"),
28+
"tracing-subscriber": crate.spec(version = "0.3.19"),
29+
"walkdir": crate.spec(version = "2.5.0"),
30+
},
31+
# `rrtd` == `rules_rust_test_determinism`
32+
repository_name = "rrtd",
33+
tags = ["manual"],
34+
)

0 commit comments

Comments
 (0)