Merge branch 'add-just' into 'master'

Add `just` to the build dependencies

See merge request redox-os/redox!1382
This commit is contained in:
Jeremy Soller 2023-12-07 15:36:14 +00:00
commit b1447312e0
5 changed files with 9 additions and 0 deletions

View file

@ -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:

View file

@ -914,6 +914,7 @@ else
fi
cargoInstall cargo-config 0.1.1
cargoInstall just 1.16.0
if [ "$dependenciesonly" = false ]; then
boot

View file

@ -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/*

View file

@ -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

View file

@ -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