From 59653ee290441da6ef68b322c1e800a7777ad995 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sat, 16 Mar 2019 20:16:00 -0600
Subject: [PATCH 1/3] Support use of new cross compiler

---
 .gitignore     |  1 +
 .gitlab-ci.yml | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 902abd01d4..ac81a4ad5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .idea/
+prefix/
 sysroot/
 **/target/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d204b9603..9d43dfe9ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,14 +27,13 @@ build:redox:
         # 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
+        - rm -rf prefix
+        - mkdir prefix
+        - wget -O - https://static.redox-os.org/toolchain/x86_64-unknown-redox/gcc-install.tar.gz | \
+          tar --extract --gzip --directory prefix
 
         # Main script
-        - make all
+        - env PATH="${PWD}/prefix/bin:$PATH" make all
 
 test:linux:
     stage: test

From 6f12bb6a327c336b938c3d3cb3ff2b58be50b3be Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sat, 16 Mar 2019 20:18:34 -0600
Subject: [PATCH 2/3] Install tar before attempting to use it

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d43dfe9ce..ae9e1a5610 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,9 +27,11 @@ build:redox:
         # 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 tar
         - rm -rf prefix
         - mkdir prefix
-        - wget -O - https://static.redox-os.org/toolchain/x86_64-unknown-redox/gcc-install.tar.gz | \
+        - wget -O - https://static.redox-os.org/toolchain/x86_64-unknown-redox/gcc-install.tar.gz |
           tar --extract --gzip --directory prefix
 
         # Main script

From 0e667c5f25f968d3663e6992d09a09ef587fa2c0 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sat, 16 Mar 2019 20:20:43 -0600
Subject: [PATCH 3/3] Remove .travis.yml

---
 .travis.yml | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 481719f9d1..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: rust
-env:
-  -
-  - TARGET=aarch64-unknown-linux-gnu
-  - TARGET=x86_64-unknown-redox
-rust:
-  - nightly
-install:
-  - if [ $TARGET == "aarch64-unknown-linux-gnu" ]; then sudo apt-get install gcc-aarch64-linux-gnu; fi
-before_script:
-  - rustup component add rustfmt-preview
-  - if [ -n "$TARGET" ]; then rustup target add $TARGET; fi
-script:
-  - ./ci.sh
-notifications:
-  email: false