commit 74ce426c80758ff5f05c65c15412dee32310a4e5
parent dede351e63843e964229d0ac52a10f24f8de5347
Author: Georges Dupéron <georges.duperon@gmail.com>
Date: Tue, 3 Jul 2018 20:28:24 +0200
.travis.yml: move self-test so that it runs first, factor out common APT packages
Diffstat:
| M | .travis.yml | | | 159 | ++++++++++--------------------------------------------------------------------- |
1 file changed, 20 insertions(+), 139 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
language: c
addons:
apt:
- packages:
+ packages: &common_apt_packages
# graphical environment
- scrot
- fluxbox
@@ -22,181 +22,62 @@ addons:
matrix:
include:
- # Thanks to https://keyholesoftware.com/2012/12/05/building_vagrant_boxes_with_veewee_on_travis/ for making me realize that VirtualBox will actually work with sudo
+ - env: MODE=self-test # Ensure that the Makefile works, especially with parallel builds.
+ script: (cd example-os && make -j 10)
+ sudo: true
+ addons:
+ apt:
+ packages:
+ - *common_apt_packages
+ - qemu
+ - qemu-system-x86
+ - qemu-system-arm
+ - bochs-sdl
+ - dosbox
- env: MODE=qemu-system-i386
sudo: false
addons:
apt:
packages:
+ - *common_apt_packages
- qemu
- qemu-system-x86
- # common:
- # graphical environment
- - scrot
- - fluxbox
- # automated GUI testing
- - sikuli-ide
- # Missing dependencies for sikuli-ide
- #- libantlr3-runtime-java # on 16.04
- - antlr3 # on 14.04
- #- jaffl-java # unavailable on Travis
- - libjna-java
- - libcommons-cli-java
- - libjson-simple-java
- - libdc1394-22
- - libdc1394-22-dev
- - wmctrl
- # example-os build dependencies:
- - nasm
- env: MODE=qemu-system-arm
sudo: false
addons:
apt:
packages:
+ - *common_apt_packages
- qemu
- qemu-system-arm
- # common:
- # graphical environment
- - scrot
- - fluxbox
- # automated GUI testing
- - sikuli-ide
- # Missing dependencies for sikuli-ide
- #- libantlr3-runtime-java # on 16.04
- - antlr3 # on 14.04
- #- jaffl-java # unavailable on Travis
- - libjna-java
- - libcommons-cli-java
- - libjson-simple-java
- - libdc1394-22
- - libdc1394-22-dev
- - wmctrl
- # example-os build dependencies:
- - nasm
+ # Thanks to https://keyholesoftware.com/2012/12/05/building_vagrant_boxes_with_veewee_on_travis/ for making me realize that VirtualBox will actually work with sudo
- env: MODE=virtualbox
sudo: true
addons:
apt:
packages:
+ - *common_apt_packages
#- virtualbox
- # common:
- # graphical environment
- - scrot
- - fluxbox
- # automated GUI testing
- - sikuli-ide
- # Missing dependencies for sikuli-ide
- #- libantlr3-runtime-java # on 16.04
- - antlr3 # on 14.04
- #- jaffl-java # unavailable on Travis
- - libjna-java
- - libcommons-cli-java
- - libjson-simple-java
- - libdc1394-22
- - libdc1394-22-dev
- - wmctrl
- # example-os build dependencies:
- - nasm
- env: MODE=bochs
sudo: false
addons:
apt:
packages:
+ - *common_apt_packages
- bochs-sdl
- # common:
- # graphical environment
- - scrot
- - fluxbox
- # automated GUI testing
- - sikuli-ide
- # Missing dependencies for sikuli-ide
- #- libantlr3-runtime-java # on 16.04
- - antlr3 # on 14.04
- #- jaffl-java # unavailable on Travis
- - libjna-java
- - libcommons-cli-java
- - libjson-simple-java
- - libdc1394-22
- - libdc1394-22-dev
- - wmctrl
- # example-os build dependencies:
- - nasm
- env: MODE=gui-sh
sudo: false
addons:
apt:
packages:
- # common:
- # graphical environment
- - scrot
- - fluxbox
- # automated GUI testing
- - sikuli-ide
- # Missing dependencies for sikuli-ide
- #- libantlr3-runtime-java # on 16.04
- - antlr3 # on 14.04
- #- jaffl-java # unavailable on Travis
- - libjna-java
- - libcommons-cli-java
- - libjson-simple-java
- - libdc1394-22
- - libdc1394-22-dev
- - wmctrl
- # example-os build dependencies:
- - nasm
+ - *common_apt_packages
- env: MODE=dosbox
sudo: false
addons:
apt:
packages:
+ - *common_apt_packages
- dosbox
- # common:
- # graphical environment
- - scrot
- - fluxbox
- # automated GUI testing
- - sikuli-ide
- # Missing dependencies for sikuli-ide
- #- libantlr3-runtime-java # on 16.04
- - antlr3 # on 14.04
- #- jaffl-java # unavailable on Travis
- - libjna-java
- - libcommons-cli-java
- - libjson-simple-java
- - libdc1394-22
- - libdc1394-22-dev
- - wmctrl
- # example-os build dependencies:
- - nasm
- - env: MODE=self-test # Ensure that the Makefile works, especially with parallel builds.
- script: (cd example-os && make -j 10)
- sudo: true
- addons:
- apt:
- packages:
- - qemu
- - qemu-system-x86
- - qemu-system-arm
- - bochs-sdl
- - dosbox
- # common:
- # graphical environment
- - scrot
- - fluxbox
- # automated GUI testing
- - sikuli-ide
- # Missing dependencies for sikuli-ide
- #- libantlr3-runtime-java # on 16.04
- - antlr3 # on 14.04
- #- jaffl-java # unavailable on Travis
- - libjna-java
- - libcommons-cli-java
- - libjson-simple-java
- - libdc1394-22
- - libdc1394-22-dev
- - wmctrl
- # example-os build dependencies:
- - nasm
install:
- ./utils/install-sikulix.sh
