vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #778 from redox-os/fix_travis_isohybrid

Browse source 
This fixes travis builds with the addition of isohybrid
This commit is contained in:
Jeremy Soller 2016-12-06 16:58:21 -07:00 committed by GitHub
parent b5bd97a2c1 9a3d33667f
commit c973aac809
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
.travis.yml
View file

@ -7,14 +7,21 @@ os:
- linux - linux
dist: trusty dist: trusty
before_install: before_install:
- if [ `uname` = "Linux" ]; then sudo apt-get install -qq nasm pkg-config fuse libfuse-dev genisoimage syslinux-utils; - if [ `uname` = "Linux" ]; then
sudo modprobe fuse; sudo chmod 666 /dev/fuse; sudo chown root:$USER /etc/fuse.conf; sudo apt-get install -qq nasm pkg-config fuse libfuse-dev genisoimage syslinux &&
sudo modprobe fuse &&
sudo chmod 666 /dev/fuse &&
sudo chown root:$USER /etc/fuse.conf;
fi
- if [ `uname` = "Darwin" ]; then brew update &&
brew install nasm gcc49 pkg-config Caskroom/cask/osxfuse &&
brew tap glendc/gcc_cross_compilers &&
brew install glendc/gcc_cross_compilers/x64-elf-binutils glendc/gcc_cross_compilers/x64-elf-gcc;
fi fi
- if [ `uname` = "Darwin" ]; then brew update; brew install nasm gcc49 pkg-config
Caskroom/cask/osxfuse; brew tap glendc/gcc_cross_compilers; brew install glendc/gcc_cross_compilers/x64-elf-binutils
glendc/gcc_cross_compilers/x64-elf-gcc; fi
script: script:
- make clean && make update && make build/harddrive.bin.gz build/livedisk.bin.gz build/livedisk.iso -j 2 - make clean &&
make update &&
make build/harddrive.bin.gz build/livedisk.bin.gz build/livedisk.iso -j 2
notifications: notifications:
email: false email: false
webhooks: http://37.139.9.28:54863/travis webhooks: http://37.139.9.28:54863/travis