diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96432e7..5fbd412 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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/ diff --git a/config/x86_64/demo.toml b/config/x86_64/demo.toml index f988c72..f6c24d3 100644 --- a/config/x86_64/demo.toml +++ b/config/x86_64/demo.toml @@ -21,7 +21,6 @@ git = {} gnu-grep = {} ripgrep = {} sodium = {} -vim = {} # Games dosbox = {} diff --git a/mk/ci.mk b/mk/ci.mk index 5a4803d..82e0701 100644 --- a/mk/ci.mk +++ b/mk/ci.mk @@ -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"