From 58217e34663d9e4f05966b05066af04f6ea370f7 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sat, 16 Mar 2019 15:23:15 -0600
Subject: [PATCH] Update gitlab CI

---
 .gitlab-ci.yml |  3 +--
 .travis.yml    | 51 --------------------------------------------------
 2 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e81c0b9..6e5815f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,11 +32,10 @@ img:
         source "$HOME/.cargo/env" &&
         rustup update &&
         rustup component add rust-src &&
-        cargo install cargo-config xargo &&
+        cargo install cargo-config cargo-xbuild xargo &&
         pushd bootloader-efi &&
         rustup update &&
         rustup component add rust-src &&
-        mkdir -p "$HOME/.rustup/toolchains/nightly-2017-11-29-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/bin" &&
         popd &&
         make ci-img IMG_TAG=$CI_COMMIT_REF_NAME
     artifacts:
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d5933cb..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-sudo: required
-dist: trusty
-language: rust
-cache: cargo
-rust:
-- nightly
-
-# OSX has been disabled for the moment
-matrix:
-  #allow_failures:
-  #  - os: osx
-  include:
-    - os: linux
-      before_install:
-        - |
-           sudo apt-key adv -q --batch --yes --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F &&
-           sudo add-apt-repository 'deb https://static.redox-os.org/toolchain/apt ./' &&
-           sudo apt-get update -qq &&
-           sudo apt-get purge -qq binutils-doc &&
-           sudo apt-get install -qq nasm pkg-config fuse libfuse-dev genisoimage syslinux realpath x86-64-unknown-redox-gcc &&
-           sudo modprobe fuse &&
-           sudo chmod 666 /dev/fuse &&
-           sudo chown root:$USER /etc/fuse.conf
-  #  - os: osx
-  #    before_install:
-  #      - |
-  #         brew update &&
-  #         brew install nasm pkg-config Caskroom/cask/osxfuse &&
-  #         travis_wait 30 brew install redox-os/gcc_cross_compilers/x86_64-elf-gcc
-
-# before_script runs after before_install
-before_script:
-- cd cookbook && ./setup.sh && cd ..
-script:
-- make clean && make travis IMG_TAG=$TRAVIS_TAG
-
-deploy:
-  provider: releases
-  api_key:
-    secure: E5w3mgFbW4fAFNJn0FGcvwGKK33d+StC4izDX7dsGPxX/gwAsMnZqabDWpsrj8n/jFI5NdPzuyz4Ojkip4AXrEs0DWfX96d9CSWvJmWIirwwKhALnxZ5cqnHnBXY3wpk9k8MKpdODzKs3ZjM3pPug2jjjp2EHdrEV6iyc8LlnLAJutbtPpNJv0rJrx/TfCZRx70YWKQyx2Lfx5P6Vj+5yoYsKk+SHmKZlIQfj2E1cfC8+/w+fzc9CRTNhM9XFBisKnu9qql3nNhEW8VUNQ9FnltGpunmcTnCmsKzHPfs8Zv6kM/6y3wuoqxwPnIwRu+zsntkjM/eT7Zy3DtTBqJDjq+L5jov50QWOxzjUuFYMv0lAMeMC0PIGn0ECpFs546M+Wqvd7HKgabac0UhilEBPbinOdW+6aOOhbo+Fe2I2ec0XIGxlQpccQeWQUsjjOQ+6QuvnpPE+CbvQaVyrx27rVAkqD44cOP8xqOq2Es651J+Dt0O1OIhLdPB3FxOLCDpEIHU5Ojci1QbUxZgGKjShpo44nNqcTv7v71JrfzFSVG2pF9a35Mpo6bFEkzyQprOyrwH2fcnN+4jyxdJXzdNsgraXsQopWAB5cL/8i7SXMwHy9ivpFaX/zgoHQqpc1a4VjrmTtPA08rLORIllw9CplfvJNsmNmCi2aSeTXR06Xk=
-  file_glob: true
-  file: build/travis/*
-  on:
-    repo: redox-os/redox
-    tags: true
-    condition: $TRAVIS_OS_NAME = linux
-  skip_cleanup: true
-
-notifications:
-  email: false
-  webhooks: http://37.139.9.28:54863/travis