vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move CI to its own makefile

Browse source
This commit is contained in:
Jeremy Soller 2022-10-11 09:12:33 -06:00
parent 00cd04c05c
commit e833e66ac9
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
2 changed files with 37 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Makefile
View file

@ -51,40 +51,8 @@ include mk/qemu.mk
include mk/bochs.mk
include mk/virtualbox.mk
# CI image target
IMG_TAG?=$(shell git describe --tags)
ci-img: FORCE
$(MAKE) REPO_BINARY=1 \
build/harddrive.img \
build/livedisk.iso
rm -rf build/img
mkdir -p build/img
cp "build/harddrive.img" "build/img/redox_$(IMG_TAG)_harddrive.img"
cp "build/livedisk.iso" "build/img/redox_$(IMG_TAG)_livedisk.iso"
cd build/img && sha256sum -b * > SHA256SUM
# CI packaging target
ci-pkg: prefix FORCE
$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
export PATH="$(PREFIX_PATH):$$PATH" && \
PACKAGES="$$($(INSTALLER) --list-packages -c ci.toml)" && \
cd cookbook && \
./fetch.sh "$${PACKAGES}" && \
./repo.sh "$${PACKAGES}"
# CI toolchain
ci-toolchain: FORCE
$(MAKE) PREFIX_BINARY=0 \
"prefix/$(TARGET)/gcc-install.tar.gz" \
"prefix/$(TARGET)/relibc-install.tar.gz" \
"prefix/$(TARGET)/rust-install.tar.gz"
rm -rf "build/toolchain/$(TARGET)"
mkdir -p "build/toolchain/$(TARGET)"
cp "prefix/$(TARGET)/gcc-install.tar.gz" "build/toolchain/$(TARGET)/gcc-install.tar.gz"
cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(TARGET)/relibc-install.tar.gz"
cp "prefix/$(TARGET)/rust-install.tar.gz" "build/toolchain/$(TARGET)/rust-install.tar.gz"
cd "build/toolchain/$(TARGET)" && sha256sum -b * > SHA256SUM
# CI
include mk/ci.mk
env: prefix FORCE
export PATH="$(PREFIX_PATH):$$PATH" && \

35
mk/ci.mk Normal file
View file

@ -0,0 +1,35 @@
IMG_TAG?=$(shell git describe --tags)
# CI image target
ci-img: FORCE
$(MAKE) REPO_BINARY=1 \
build/harddrive.img \
build/livedisk.iso
rm -rf build/img
mkdir -p build/img
cp "build/harddrive.img" "build/img/redox_$(IMG_TAG)_harddrive.img"
cp "build/livedisk.iso" "build/img/redox_$(IMG_TAG)_livedisk.iso"
cd build/img && sha256sum -b * > SHA256SUM
# CI packaging target
ci-pkg: prefix FORCE
$(HOST_CARGO) build --manifest-path cookbook/Cargo.toml --release
$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
export PATH="$(PREFIX_PATH):$$PATH" && \
PACKAGES="$$($(INSTALLER) --list-packages -c ci.toml)" && \
cd cookbook && \
./fetch.sh "$${PACKAGES}" && \
./repo.sh "$${PACKAGES}"
# CI toolchain
ci-toolchain: FORCE
$(MAKE) PREFIX_BINARY=0 \
"prefix/$(TARGET)/gcc-install.tar.gz" \
"prefix/$(TARGET)/relibc-install.tar.gz" \
"prefix/$(TARGET)/rust-install.tar.gz"
rm -rf "build/toolchain/$(TARGET)"
mkdir -p "build/toolchain/$(TARGET)"
cp "prefix/$(TARGET)/gcc-install.tar.gz" "build/toolchain/$(TARGET)/gcc-install.tar.gz"
cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(TARGET)/relibc-install.tar.gz"
cp "prefix/$(TARGET)/rust-install.tar.gz" "build/toolchain/$(TARGET)/rust-install.tar.gz"
cd "build/toolchain/$(TARGET)" && sha256sum -b * > SHA256SUM