summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-08-15 11:39:31 +1000
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2018-08-16 11:18:57 +1000
commit0462fd93ac1be3bfe3d3c9d1b118e9e8bff463cd (patch)
treeb71d00ae25992a4d1a25479a999a8d300e0560cc
parent878a2a52b8995ace920ed6aa3d67fe05aeb64d6a (diff)
downloadtalos-petitboot-0462fd93ac1be3bfe3d3c9d1b118e9e8bff463cd.zip
talos-petitboot-0462fd93ac1be3bfe3d3c9d1b118e9e8bff463cd.tar.gz
travis: Use docker scriptsv1.9.0
Update the Travis config to use Petitboot's own docker scripts, and add ppc64le to the list of recognised architectures. Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--.travis.yml11
-rw-r--r--docker/builder-include1
2 files changed, 4 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 1b82a1a..f458213 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,13 @@ language: c
sudo: required
dist: trusty
+services: docker
os:
- linux
- linux-ppc64le
before_install:
- - sudo apt-get -qq update
- - sudo apt-get install -y autopoint libuv-dev libdevmapper-dev flex bison
- - ./bootstrap
-
-install:
- - ./configure --with-twin-x11=no --with-twin-fbdev=no
- - make
+ - ./docker/build-builder
script:
- - make check
+ - ./docker/build-pb --check --verbose --configure-opts "--enable-platform-arm64 --enable-platform-powerpc"
diff --git a/docker/builder-include b/docker/builder-include
index 4f42e2c..585be26 100644
--- a/docker/builder-include
+++ b/docker/builder-include
@@ -25,6 +25,7 @@ docker_from() {
case "${a}" in
amd64) echo "ubuntu:17.10" ;;
arm64) echo "arm64v8/ubuntu:17.10" ;;
+ ppc64le) echo "ppc64le/ubuntu:17.10" ;;
*)
echo "${name}: ERROR: Unknown arch ${a}" >&2
exit 1
OpenPOWER on IntegriCloud