Update conditions
This commit is contained in:
parent
9c35ed4c6b
commit
e31bf23c01
10
.travis.yml
10
.travis.yml
|
@ -6,15 +6,20 @@ cache: cargo
|
||||||
os:
|
os:
|
||||||
- linux
|
- linux
|
||||||
- osx
|
- osx
|
||||||
|
matrix:
|
||||||
|
allow_failures:
|
||||||
|
- os: osx
|
||||||
dist: trusty
|
dist: trusty
|
||||||
before_install:
|
before_install:
|
||||||
- if [ `uname` = "Linux" ]; then
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
|
||||||
|
sudo apt-get update -qq
|
||||||
sudo apt-get install -qq nasm pkg-config fuse libfuse-dev genisoimage syslinux &&
|
sudo apt-get install -qq nasm pkg-config fuse libfuse-dev genisoimage syslinux &&
|
||||||
sudo modprobe fuse &&
|
sudo modprobe fuse &&
|
||||||
sudo chmod 666 /dev/fuse &&
|
sudo chmod 666 /dev/fuse &&
|
||||||
sudo chown root:$USER /etc/fuse.conf;
|
sudo chown root:$USER /etc/fuse.conf;
|
||||||
fi
|
fi
|
||||||
- if [ `uname` = "Darwin" ]; then brew update &&
|
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
|
||||||
|
brew update &&
|
||||||
brew install nasm gcc49 pkg-config Caskroom/cask/osxfuse &&
|
brew install nasm gcc49 pkg-config Caskroom/cask/osxfuse &&
|
||||||
brew tap glendc/gcc_cross_compilers &&
|
brew tap glendc/gcc_cross_compilers &&
|
||||||
brew install glendc/gcc_cross_compilers/x64-elf-binutils glendc/gcc_cross_compilers/x64-elf-gcc;
|
brew install glendc/gcc_cross_compilers/x64-elf-binutils glendc/gcc_cross_compilers/x64-elf-gcc;
|
||||||
|
@ -37,4 +42,5 @@ deploy:
|
||||||
on:
|
on:
|
||||||
repo: redox-os/redox
|
repo: redox-os/redox
|
||||||
tags: true
|
tags: true
|
||||||
|
condition: $TRAVIS_OS_NAME = linux
|
||||||
skip_cleanup: true
|
skip_cleanup: true
|
||||||
|
|
Loading…
Reference in a new issue