diff options
| author | Tilo Spannagel <development@tilosp.de> | 2017-06-29 12:57:03 +0200 |
|---|---|---|
| committer | Tilo Spannagel <development@tilosp.de> | 2017-06-29 16:29:52 +0200 |
| commit | 820f21cdf219a0c23ed282de2f5e982503eb1b42 (patch) | |
| tree | cafbe37e018c3d2b9e88179e2dcb8636e47e4a1f | |
| parent | 7d4e0960b4c958b10471ff1a561253adfe3f0c32 (diff) | |
Add travis tests for i386
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rwxr-xr-x | update.sh | 4 |
2 files changed, 16 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 5165ceb3..83276eef 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 @@ -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 |