Skip to content

Commit

Permalink
ci-builder: Fix build with Rust 1.80.1 and detect WORKSPACE changes
Browse files Browse the repository at this point in the history
  • Loading branch information
def- committed Dec 2, 2024
1 parent 87e0752 commit fc73b28
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bin/ci-builder
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ fi
# *inside* this image. See materialize.git.expand_globs in the Python code for
# details on this computation.
files=$(cat \
<(git diff --name-only -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 ci/builder .bazelversion) \
<(git diff --name-only -z 4b825dc642cb6eb9a060e54bf8d69288fbee4904 ci/builder .bazelversion WORKSPACE) \
<(git ls-files --others --exclude-standard -z ci/builder) \
| LC_ALL=C sort -z \
| xargs -0 "$shasum")
Expand Down
8 changes: 4 additions & 4 deletions ci/builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ RUN mkdir rust \
&& cargo install --root /usr/local --version ="0.9.28" --locked cargo-hakari \
&& cargo install --root /usr/local --version "=0.9.72" --locked cargo-nextest \
&& cargo install --root /usr/local --version "=0.6.11" --locked cargo-llvm-cov \
&& cargo install --root /usr/local --version "=0.1.50" --features=vendored-openssl cargo-udeps \
&& cargo install --root /usr/local --version "=0.2.15" --no-default-features --features=s3,openssl/vendored sccache \
&& cargo install --root /usr/local --version "=0.3.6" cargo-binutils \
&& cargo install --root /usr/local --version "=0.13.0" wasm-pack
&& cargo install --root /usr/local --version "=0.1.50" --locked --features=vendored-openssl cargo-udeps \
&& cargo install --root /usr/local --version "=0.2.15" --locked --no-default-features --features=s3,openssl/vendored sccache \
&& cargo install --root /usr/local --version "=0.3.6" --locked cargo-binutils \
&& cargo install --root /usr/local --version "=0.13.0" --locked wasm-pack

# Link the system lld into the cross-compiling sysroot.

Expand Down

0 comments on commit fc73b28

Please sign in to comment.