Fix CI to avoid RedoxFS/FUSE/tar problems

This commit is contained in:
Ron Williams 2024-08-28 12:55:25 -07:00
parent 15070165f3
commit fd40776d35
3 changed files with 2 additions and 3 deletions

View file

@ -35,7 +35,7 @@ img:
cargo binstall --no-confirm --version 1.16.0 just &&
cargo binstall --no-confirm --version 0.26.0 cbindgen &&
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
artifacts:
paths:
- build/img/

View file

@ -21,7 +21,6 @@ git = {}
gnu-grep = {}
ripgrep = {}
sodium = {}
vim = {}
# Games
dosbox = {}

View file

@ -14,7 +14,7 @@ ci-img: FORCE
cd $(IMG_DIR) && sha256sum -b * > SHA256SUM
# The name of the target must match the name of the filesystem config file
desktop server demo: FORCE
server desktop demo: FORCE
rm -f "build/$(ARCH)/$@/harddrive.img" "build/$(ARCH)/$@/livedisk.iso"
$(MAKE) CONFIG_NAME=$@ build/$(ARCH)/$@/harddrive.img build/$(ARCH)/$@/livedisk.iso
cp "build/$(ARCH)/$@/harddrive.img" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_harddrive.img"