Merge pull request #539 from nextcloud/update-sh

Run update.sh
This commit is contained in:
Tilo Spannagel 2018-11-15 23:15:01 +01:00 committed by GitHub
commit b6b83ba7ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 5 deletions

View File

@ -56,6 +56,24 @@ jobs:
- env: VERSION=15.0-beta VARIANT=fpm ARCH=i386 - env: VERSION=15.0-beta VARIANT=fpm ARCH=i386
- env: VERSION=15.0-beta VARIANT=apache ARCH=amd64 - env: VERSION=15.0-beta VARIANT=apache ARCH=amd64
- env: VERSION=15.0-beta VARIANT=apache ARCH=i386 - env: VERSION=15.0-beta VARIANT=apache ARCH=i386
- env: VERSION=12.0-rc VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=12.0-rc VARIANT=fpm-alpine ARCH=i386
- env: VERSION=12.0-rc VARIANT=fpm ARCH=amd64
- env: VERSION=12.0-rc VARIANT=fpm ARCH=i386
- env: VERSION=12.0-rc VARIANT=apache ARCH=amd64
- env: VERSION=12.0-rc VARIANT=apache ARCH=i386
- env: VERSION=13.0-rc VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=13.0-rc VARIANT=fpm-alpine ARCH=i386
- env: VERSION=13.0-rc VARIANT=fpm ARCH=amd64
- env: VERSION=13.0-rc VARIANT=fpm ARCH=i386
- env: VERSION=13.0-rc VARIANT=apache ARCH=amd64
- env: VERSION=13.0-rc VARIANT=apache ARCH=i386
- env: VERSION=14.0-rc VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=14.0-rc VARIANT=fpm-alpine ARCH=i386
- env: VERSION=14.0-rc VARIANT=fpm ARCH=amd64
- env: VERSION=14.0-rc VARIANT=fpm ARCH=i386
- env: VERSION=14.0-rc VARIANT=apache ARCH=amd64
- env: VERSION=14.0-rc VARIANT=apache ARCH=i386
- env: VERSION=12.0 VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=amd64
- env: VERSION=12.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=12.0 VARIANT=fpm-alpine ARCH=i386
- env: VERSION=12.0 VARIANT=fpm ARCH=amd64 - env: VERSION=12.0 VARIANT=fpm ARCH=amd64

View File

@ -97,7 +97,7 @@ function create_variant() {
fi fi
for arch in i386 amd64; do for arch in i386 amd64; do
travisEnv='\n - env: VERSION='"$1"' VARIANT='"$variant"' ARCH='"$arch$travisEnv" travisEnv=' - env: VERSION='"$1"' VARIANT='"$variant"' ARCH='"$arch"'\n'"$travisEnv"
done done
} }
@ -160,9 +160,10 @@ for version in "${versions_beta[@]}"; do
fi fi
done done
# remove everything after '- stage: test images'
travis="$(awk '!p; /- stage: test images/ {p=1}' .travis.yml)"
echo "$travis" > .travis.yml
# replace the fist '-' with ' ' # replace the fist '-' with ' '
travisEnv="$(echo "$travisEnv" | sed '0,/-/{s/-/ /}')" travisEnv="$(echo "$travisEnv" | sed '0,/-/{s/-/ /}')"
printf "$travisEnv" >> .travis.yml
# update .travis.yml
travis="$(awk -v 'RS=\n\n' '$1 == "-" && $2 == "stage:" && $3 == "test" && $4 == "images" { $0 = " - stage: test images'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
echo "$travis" > .travis.yml