From 30ec8aa2c96c5981b67f21163a5122e29319e8bb Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Mon, 2 Jul 2018 10:35:40 +0200
Subject: [PATCH] Add redox to CI
---
.gitlab-ci.yml | 24 +++++++++++++++++++-----
tests/expected/wchar/mbrtowc.stdout | 2 +-
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9ee46683c..628873551 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,8 @@ stages:
before_script:
- git submodule update --init --recursive
- - rustup target add x86_64-unknown-redox --toolchain nightly
+ - rustup toolchain add "$(cat rust-toolchain)"
+ - rustup target add x86_64-unknown-redox --toolchain "$(cat rust-toolchain)"
- rustup show # Print version info for debugging
cache:
@@ -17,10 +18,22 @@ build:linux:
script:
- make all
-#build:redox:
-# stage: build
-# script:
-# - make all
+build:redox:
+ stage: build
+ variables:
+ TARGET: x86_64-unknown-redox
+ script:
+ # Install x86_64-unknown-redox-gcc
+ # This can't be in before_script because that overrides
+ # the global before_script.
+ - apt-get update -qq
+ - apt-get install -qq apt-transport-https build-essential curl git gnupg software-properties-common
+ - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F
+ - add-apt-repository 'deb https://static.redox-os.org/toolchain/apt /'
+ - apt-get update -qq && apt-get install -qq x86-64-unknown-redox-gcc
+
+ # Main script
+ - make all
test:linux:
stage: test
@@ -28,6 +41,7 @@ test:linux:
- build:linux
script:
- make test
+ - cd tests && make verify
fmt:
stage: test
diff --git a/tests/expected/wchar/mbrtowc.stdout b/tests/expected/wchar/mbrtowc.stdout
index a82952475..ae1d1cd6f 100644
--- a/tests/expected/wchar/mbrtowc.stdout
+++ b/tests/expected/wchar/mbrtowc.stdout
@@ -1,2 +1,2 @@
Processing 11 UTF-8 code units: [ 7a c3 9f e6 b0 b4 f0 9f 8d 8c 0 ]
-into 5 wchar_t units: [ 7a df 6c34 1f34c 0 ]
\ No newline at end of file
+into 5 wchar_t units: [ 7a df 6c34 1f34c 0 ]
--
GitLab