From 820f21cdf219a0c23ed282de2f5e982503eb1b42 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 29 Jun 2017 12:57:03 +0200 Subject: [PATCH] Add travis tests for i386 --- .travis.yml | 19 +++++++++++++------ update.sh | 4 +++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5165ceb..83276ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ install: before_script: - env | sort - image="nextcloud:${VERSION}${VARIANT:+-$VARIANT}" + - if [[ "$ARCH" == 'i386' ]]; then sed -i -e 's/FROM php/FROM i386\/php/g' "${VERSION}/${VARIANT}/Dockerfile"; fi script: - travis_retry docker build -t "$image" "${VERSION}/${VARIANT}" @@ -40,9 +41,15 @@ jobs: - ./generate-stackbrew-library.sh - stage: test images - env: VERSION=10.0 VARIANT=fpm - - env: VERSION=10.0 VARIANT=apache - - env: VERSION=11.0 VARIANT=fpm - - env: VERSION=11.0 VARIANT=apache - - env: VERSION=12.0 VARIANT=fpm - - env: VERSION=12.0 VARIANT=apache + env: VERSION=10.0 VARIANT=fpm ARCH=amd64 + - env: VERSION=10.0 VARIANT=fpm ARCH=i386 + - env: VERSION=10.0 VARIANT=apache ARCH=amd64 + - env: VERSION=10.0 VARIANT=apache ARCH=i386 + - env: VERSION=11.0 VARIANT=fpm ARCH=amd64 + - env: VERSION=11.0 VARIANT=fpm ARCH=i386 + - env: VERSION=11.0 VARIANT=apache ARCH=amd64 + - env: VERSION=11.0 VARIANT=apache ARCH=i386 + - env: VERSION=12.0 VARIANT=fpm ARCH=amd64 + - env: VERSION=12.0 VARIANT=fpm ARCH=i386 + - env: VERSION=12.0 VARIANT=apache ARCH=amd64 + - env: VERSION=12.0 VARIANT=apache ARCH=i386 diff --git a/update.sh b/update.sh index 647e3e2..c8a9416 100755 --- a/update.sh +++ b/update.sh @@ -59,7 +59,9 @@ for latest in "${latests[@]}"; do # Copy apps.config.php cp apps.config.php "$version/$variant/apps.config.php" - travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant$travisEnv" + for arch in i386 amd64; do + travisEnv='\n - env: VERSION='"$version"' VARIANT='"$variant"' ARCH='"$arch$travisEnv" + done done fi done