From 06d3a2a81b3685f5751d7a43f3f13a490ba22904 Mon Sep 17 00:00:00 2001
From: Benjamin Hoffmeyer <hoffmeyer25@gmail.com>
Date: Sun, 11 Feb 2018 10:18:18 -0500
Subject: [PATCH] Cleanup travis config
If statements end up looking weird and are relatively unneeded.
---
.travis.yml | 60 +++++++++++++++++++++++++++++------------------------
1 file changed, 33 insertions(+), 27 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index fc551af0f..2076d1f47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,37 +1,39 @@
sudo: required
+dist: trusty
language: rust
+cache: cargo
rust:
- nightly
-cache: cargo
-os:
-- linux
-#- osx
-#matrix:
-# allow_failures:
-# - os: osx
-dist: trusty
-before_install:
-- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
- 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;
- fi
-- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
- brew update &&
- brew install nasm pkg-config Caskroom/cask/osxfuse &&
- travis_wait 30 brew install redox-os/gcc_cross_compilers/x86_64-elf-gcc;
- fi
+
+# 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
-notifications:
- email: false
- webhooks: http://37.139.9.28:54863/travis
+
deploy:
provider: releases
api_key:
@@ -43,3 +45,7 @@ deploy:
tags: true
condition: $TRAVIS_OS_NAME = linux
skip_cleanup: true
+
+notifications:
+ email: false
+ webhooks: http://37.139.9.28:54863/travis
--
GitLab