浏览代码

Use redoxer.sh for Redox testing

Jeremy Soller 2 年之前
父节点
当前提交
063d25414e
共有 1 个文件被更改,包括 3 次插入10 次删除
  1. 3 10
      .gitlab-ci.yml

+ 3 - 10
.gitlab-ci.yml

@@ -15,7 +15,7 @@ default:
 build:linux:
     stage: build
     script:
-        - rustup show      # Print version info for debugging
+        - rustup show # Ensure correct toolchain is downloaded and installed
         - make -j "$(nproc)" all
 
 build:redox:
@@ -23,10 +23,7 @@ build:redox:
     variables:
         TARGET: x86_64-unknown-redox
     script:
-        - export RUSTUP_TOOLCHAIN="$HOME/.redoxer/toolchain"
-        - export PATH="$RUSTUP_TOOLCHAIN/bin:$PATH"
-        - rustup show      # Print version info for debugging
-        - make -j "$(nproc)" all
+        - ./redoxer.sh -j "$(nproc)" all
 
 test:linux:
     stage: test
@@ -46,11 +43,7 @@ test:redox:
     variables:
         TARGET: x86_64-unknown-redox
     script:
-        - export CARGO_TEST="redoxer"
-        - export RUSTUP_TOOLCHAIN="$HOME/.redoxer/toolchain"
-        - export PATH="$RUSTUP_TOOLCHAIN/bin:$PATH"
-        - export TEST_RUNNER="redoxer exec --folder . -- sh --"
-        - make test
+        - ./redoxer.sh test
     # TODO: Out of memory
     allow_failure: true