From c1cd4724a7f1a55984152d6d2c5dc524a402a9b5 Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 16 Dec 2025 02:49:19 +0700 Subject: [PATCH] Fix CI by avoiding FUSE --- .gitlab-ci.yml | 2 +- mk/config.mk | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2ef502ec..bb8e9df63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,7 +60,7 @@ img: - | export PATH="$HOME/.cargo/bin:$PATH" && bash podman/rustinstall.sh && - PODMAN_BUILD=0 REPO_BINARY=1 COOKBOOK_VERBOSE=false make ci-img IMG_TAG=$CI_COMMIT_REF_NAME && + PODMAN_BUILD=0 REPO_BINARY=1 FSTOOLS_NO_MOUNT=1 COOKBOOK_VERBOSE=false make ci-img IMG_TAG=$CI_COMMIT_REF_NAME && ([ $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" ] && rm -rf build/img/* || true) artifacts: paths: diff --git a/mk/config.mk b/mk/config.mk index c7e5d8ce7..274e2ddf6 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -42,6 +42,8 @@ REDOXFS_MKFS_FLAGS?= PODMAN_BUILD?=1 ## Set to 1 to put filesystem tools inside podman, any other value will install it to host FSTOOLS_IN_PODMAN?=0 +## Set to 1 if FUSE is not available and we are running in a container +FSTOOLS_NO_MOUNT?=0 ## Enable sccache to speed up cargo builds ## only do this by default if this is inside podman SCCACHE_BUILD?=$(shell [ -f /run/.containerenv ] && echo 1 || echo 0) @@ -152,6 +154,9 @@ ifeq ($(REPO_BINARY),1) INSTALLER_OPTS+=--repo-binary COOKBOOK_OPTS+=--repo-binary endif +ifeq ($(FSTOOLS_NO_MOUNT),1) +INSTALLER_OPTS+=--no-mount +endif REPO_TAG=$(BUILD)/repo.tag FSTOOLS_TAG=build/fstools.tag