From 382c6efb3989baa3414ad60f7e113df8f4128df2 Mon Sep 17 00:00:00 2001
From: SamwiseFilmore <mggmugginsmc@gmail.com>
Date: Sun, 24 Jun 2018 00:48:54 +0000
Subject: [PATCH 1/2] Add Gitlab CI

---
 .gitlab-ci.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000..4fc1505dae
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,26 @@
+image: "rust:latest"
+
+before_script:
+    - 
+    - rustup toolchain add nightly
+    - rustup target add x86_64-unknown-redox --toolchain nightly
+    - rustup show      # Print version info for debugging
+
+build:linux:
+    script:
+        - make all
+
+#build:redox:
+#    script:
+#        - make all
+
+test:linux:
+    script:
+        - make test
+
+fmt:
+    script:
+        - ./fmt.sh -- --write-mode=diff
+
+# TODO: Set up a docker image with a redox vm that would allow to
+#   run things like tests under redox
\ No newline at end of file

From 59f1b37be86db8b69af93a5fa12c597c60bb80cb Mon Sep 17 00:00:00 2001
From: SamwiseFilmore <mggmugginsmc@gmail.com>
Date: Sun, 24 Jun 2018 00:51:37 +0000
Subject: [PATCH 2/2] Fix dumb mistake

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4fc1505dae..ad1d6b1742 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
 image: "rust:latest"
 
 before_script:
-    - 
     - rustup toolchain add nightly
     - rustup target add x86_64-unknown-redox --toolchain nightly
     - rustup show      # Print version info for debugging