From 5b2f2ecd5309f475f85b3b8a5b4d93b1b01de0cc Mon Sep 17 00:00:00 2001 From: Wildan M Date: Fri, 3 Jul 2026 14:59:57 +0700 Subject: [PATCH] Fix build GUI and add CI check --- .gitlab-ci.yml | 12 +++++++++++- gui/src/sys/redox.rs | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4aa5e9eb7f..2480281dc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,3 @@ -image: "rust:latest" stages: - lint @@ -10,15 +9,26 @@ workflow: - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' fmt: + image: "rust:latest" stage: lint script: - rustup component add rustfmt - cargo fmt -- --check + - cd gui && cargo fmt -- --check cargo-test: + image: "rust:latest" stage: test script: - apt update && apt install -y fuse3 libfuse3-dev - cargo build --locked - cargo test - ./target/debug/redox_installer -c res/test.toml test.bin --no-mount + +gui-build: + stage: test + script: + - apt update && apt install -y fuse3 libfuse3-dev + - cd gui + - redoxer build + - cargo build diff --git a/gui/src/sys/redox.rs b/gui/src/sys/redox.rs index 867b00517b..690047a565 100644 --- a/gui/src/sys/redox.rs +++ b/gui/src/sys/redox.rs @@ -75,7 +75,7 @@ pub fn disk_paths() -> Result, String> { let Ok(metadata) = entry.metadata() else { continue; }; - let is_partition = file_name.contains(p); + let is_partition = file_name.contains('p'); let size = metadata.len(); if size == 0 { continue;