Skip to content

Commit

Permalink
Unbreak CI (#769)
Browse files Browse the repository at this point in the history
Breakages were caused by a formatting issue and caching issues.
  • Loading branch information
aaronmondal committed Mar 17, 2024
1 parent 4b8eeaf commit 682c4fe
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/nix.yaml
Expand Up @@ -34,12 +34,14 @@ jobs:
uses: >- # Custom commit, last pinned at 2024-03-03.
DeterminateSystems/magic-nix-cache-action@742d8701e54851d2136f71b61d31382a4f4d0788
- name: Mount bazel cache
uses: >- # v4.0.1
actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
with:
path: "~/.cache/bazel"
key: ${{ runner.os }}-bazel-nix
# TODO(aaronmondal): Figure out why this cache breaks CI.
# See: https://github.com/TraceMachina/nativelink/issues/772
# - name: Mount bazel cache
# uses: >- # v4.0.1
# actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319
# with:
# path: "~/.cache/bazel"
# key: ${{ runner.os }}-bazel-nix

- name: Invoke Bazel build in Nix shell
run: |
Expand Down
10 changes: 5 additions & 5 deletions nativelink-store/src/completeness_checking_store.rs
Expand Up @@ -89,11 +89,11 @@ async fn check_output_directories(
let tree = get_and_decode_digest::<ProtoTree>(cas_store, &tree_digest).await?;
// TODO(allada) When `try_collect()` is stable we can use it instead.
// https://github.com/rust-lang/rust/issues/94047
let mut digest_iter = tree
.children
.into_iter()
.chain(tree.root)
.flat_map(|dir| dir.files.into_iter().filter_map(|f| f.digest.map(DigestInfo::try_from)));
let mut digest_iter = tree.children.into_iter().chain(tree.root).flat_map(|dir| {
dir.files
.into_iter()
.filter_map(|f| f.digest.map(DigestInfo::try_from))
});

let mut digest_infos = Vec::with_capacity(digest_iter.size_hint().1.unwrap_or(0));
digest_iter
Expand Down

0 comments on commit 682c4fe

Please sign in to comment.