From bbcb3d19be790043eb911262c34ab6277f7b944b Mon Sep 17 00:00:00 2001 From: Wildan M Date: Tue, 17 Mar 2026 18:44:28 +0700 Subject: [PATCH] Try using uname, fix relibc --- .gitlab-ci.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8b65415db..53a40cdc5e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,7 @@ x86_64:boot: script: - mkdir -p target/${ARCH} - redoxer env make BUILD=target/${ARCH} - - timeout -s KILL 9m redoxer exec --folder target/${ARCH}:/usr/lib/boot true + - timeout -s KILL 9m redoxer exec --folder target/${ARCH}:/usr/lib/boot uname -a variables: ARCH: "x86_64" @@ -70,10 +70,13 @@ x86_64:relibc: - mkdir -p target/${ARCH} - redoxer env make BUILD=target/${ARCH} - redoxer pkg relibc-tests-bins - - mkdir -p target/${ARCH}-unknown-redox/sysroot/usr/lib/boot - - cp target/${ARCH}/kernel target/${ARCH}-unknown-redox/sysroot/usr/lib/boot/ - - timeout -s KILL 9m redoxer exec sh -c "cd /root/relibc-tests && sh -e ./run.sh" + - mkdir -p target/${TARGET}/sysroot/usr/lib/boot + - cp target/${ARCH}/kernel target/${TARGET}/sysroot/usr/lib/boot/ + # TODO: pkg command need to be polished + - rm -rf target/${TARGET}/sysroot/{etc,pkg,include,share} + - timeout -s KILL 9m redoxer exec --folder target/${TARGET}/sysroot:/ sh -c "cd /root/relibc-tests && sh -e ./run.sh" # Not guaranteed to succeed all of them allow_failure: true variables: ARCH: "x86_64" + TARGET: "x86_64-unknown-redox"