Add just
to the build dependencies
This commit is contained in:
parent
15d94b2fd6
commit
b86622d73b
|
@ -36,6 +36,7 @@ img:
|
||||||
- |
|
- |
|
||||||
source "$HOME/.cargo/env" &&
|
source "$HOME/.cargo/env" &&
|
||||||
cargo install --version 0.1.1 cargo-config &&
|
cargo install --version 0.1.1 cargo-config &&
|
||||||
|
cargo install --version 1.16.0 just &&
|
||||||
cargo build --manifest-path installer/Cargo.toml --release &&
|
cargo build --manifest-path installer/Cargo.toml --release &&
|
||||||
make ci-img IMG_TAG=$CI_COMMIT_REF_NAME REPO_BINARY=1
|
make ci-img IMG_TAG=$CI_COMMIT_REF_NAME REPO_BINARY=1
|
||||||
artifacts:
|
artifacts:
|
||||||
|
|
|
@ -914,6 +914,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cargoInstall cargo-config 0.1.1
|
cargoInstall cargo-config 0.1.1
|
||||||
|
cargoInstall just 1.16.0
|
||||||
|
|
||||||
if [ "$dependenciesonly" = false ]; then
|
if [ "$dependenciesonly" = false ]; then
|
||||||
boot
|
boot
|
||||||
|
|
|
@ -31,6 +31,7 @@ RUN set -ex; \
|
||||||
x86-64-unknown-redox-gcc \
|
x86-64-unknown-redox-gcc \
|
||||||
; \
|
; \
|
||||||
cargo install cargo-config; \
|
cargo install cargo-config; \
|
||||||
|
cargo install just@1.16.0; \
|
||||||
apt-get autoremove -q -y; \
|
apt-get autoremove -q -y; \
|
||||||
apt-get clean -q -y; \
|
apt-get clean -q -y; \
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
|
@ -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")
|
$(error cargo-config $(CARGO_CONFIG_VERSION) not found, run "cargo install --force --version $(CARGO_CONFIG_VERSION) cargo-config")
|
||||||
endif
|
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
|
endif
|
||||||
|
|
|
@ -4,3 +4,4 @@
|
||||||
|
|
||||||
curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain nightly
|
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 0.1.1 cargo-config
|
||||||
|
cargo install --force --version 1.16.0 just
|
||||||
|
|
Loading…
Reference in a new issue