From 2ddf1dab3fefbaf310afd6d2fe3fcf912d9643f6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 6 Jul 2019 11:37:19 -0600 Subject: [PATCH] Update CI configuration to use redoxer --- .gitlab-ci.yml | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a05a47526..d6fa046fb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,33 +1,27 @@ -image: "redoxos/redox" +image: "redoxos/redoxer" stages: - build - test -before_script: - - rustup target add x86_64-unknown-redox --toolchain nightly - - rustup show # Print version info for debugging - cache: paths: - target/ -build:linux:cargo: +build:linux: stage: build script: cargo +nightly build --verbose -build:redox:cargo: +build:redox: stage: build - script: - - mkdir .cargo - - echo -e "[target.x86_64-unknown-redox]\nlinker = \"x86_64-unknown-redox-gcc\"" > .cargo/config - - cargo +nightly build --verbose --target x86_64-unknown-redox + script: redoxer build --verbose -test:linux:cargo: +test:linux: stage: test - dependencies: - - build:linux:cargo + dependencies: build:linux script: cargo +nightly test --verbose -# TODO: Set up a docker image with a redox vm that would allow to -# run things like tests under redox +test:redox: + stage: test + dependencies: test:redox + script: redoxer test --verbose