# HG changeset patch # User Georges Racinet <georges.racinet@octobus.net> # Date 1688831476 -7200 # Sat Jul 08 17:51:16 2023 +0200 # Node ID da452a65d801aace89560f6a4ab8fd857aa29c0e # Parent 203acd44cc8531755a672c13b5cb0476064e6344 CI/CD: work if Cargo is more globally available For GitLab 15.9, we'll take advantage of the fact that upstream CI image does have the Rust toolchain ( installed to `/usr/local`). However it did not keep `/root/.cargo/env`. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -129,7 +129,7 @@ - make -C rust dev-dependencies # prebuilding RHGitaly to avoid doing it from tests # (output is interesting and we avoid timeout issues) - - . /root/.cargo/env + - test -e /root/.cargo/env && . /root/.cargo/env - cargo build --manifest-path rust/Cargo.toml - echo "Full test run with Gitaly and RHGitaly Comparison tests" - ./run-all-tests