diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db1bac9..4d06df0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,6 +36,7 @@ img: - | source "$HOME/.cargo/env" && cargo install --version 0.1.1 cargo-config && + cargo install --version 1.16.0 just && cargo build --manifest-path installer/Cargo.toml --release && make ci-img IMG_TAG=$CI_COMMIT_REF_NAME REPO_BINARY=1 artifacts: diff --git a/bootstrap.sh b/bootstrap.sh index 4f993a3..81b9bee 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -914,6 +914,7 @@ else fi cargoInstall cargo-config 0.1.1 +cargoInstall just 1.16.0 if [ "$dependenciesonly" = false ]; then boot diff --git a/docker/Dockerfile b/docker/Dockerfile index 736043e..6c57555 100755 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,6 +31,7 @@ RUN set -ex; \ x86-64-unknown-redox-gcc \ ; \ cargo install cargo-config; \ + cargo install just@1.16.0; \ apt-get autoremove -q -y; \ apt-get clean -q -y; \ rm -rf /var/lib/apt/lists/* diff --git a/mk/depends.mk b/mk/depends.mk index 2a5bb25..a8b5492 100644 --- a/mk/depends.mk +++ b/mk/depends.mk @@ -16,4 +16,9 @@ ifeq ($(shell env -u RUSTUP_TOOLCHAIN cargo install --list | grep '^cargo-config $(error cargo-config $(CARGO_CONFIG_VERSION) not found, run "cargo install --force --version $(CARGO_CONFIG_VERSION) cargo-config") endif +JUST_VERSION=1.16.0 +ifeq ($(shell env -u RUSTUP_TOOLCHAIN cargo install --list | grep '^just v$(JUST_VERSION):$$'),) +$(error just $(JUST_VERSION) not found, run "cargo install --force --version $(JUST_VERSION) just") +endif + endif diff --git a/podman/rustinstall.sh b/podman/rustinstall.sh index b217c5c..e85fe68 100755 --- a/podman/rustinstall.sh +++ b/podman/rustinstall.sh @@ -4,3 +4,4 @@ curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly cargo install --force --version 0.1.1 cargo-config +cargo install --force --version 1.16.0 just