From ba4fc2dcbb50617656d5a167fb4c2a5d5bed8e19 Mon Sep 17 00:00:00 2001 From: tilosp-bot Date: Thu, 12 Sep 2019 08:26:28 +0000 Subject: [PATCH 1/2] Run update.sh Signed-off-by: tilosp-bot --- .travis.yml | 12 ++++++------ {17.0-beta => 17.0-rc}/apache/Dockerfile | 2 +- .../apache/config/apache-pretty-urls.config.php | 0 {17.0-beta => 17.0-rc}/apache/config/apcu.config.php | 0 {17.0-beta => 17.0-rc}/apache/config/apps.config.php | 0 {17.0-beta => 17.0-rc}/apache/config/autoconfig.php | 0 .../apache/config/redis.config.php | 0 {17.0-beta => 17.0-rc}/apache/config/smtp.config.php | 0 {17.0-beta => 17.0-rc}/apache/cron.sh | 0 {17.0-beta => 17.0-rc}/apache/entrypoint.sh | 0 {17.0-beta => 17.0-rc}/apache/upgrade.exclude | 0 {17.0-beta => 17.0-rc}/fpm-alpine/Dockerfile | 2 +- .../fpm-alpine/config/apcu.config.php | 0 .../fpm-alpine/config/apps.config.php | 0 .../fpm-alpine/config/autoconfig.php | 0 .../fpm-alpine/config/redis.config.php | 0 .../fpm-alpine/config/smtp.config.php | 0 {17.0-beta => 17.0-rc}/fpm-alpine/cron.sh | 0 {17.0-beta => 17.0-rc}/fpm-alpine/entrypoint.sh | 0 {17.0-beta => 17.0-rc}/fpm-alpine/upgrade.exclude | 0 {17.0-beta => 17.0-rc}/fpm/Dockerfile | 2 +- {17.0-beta => 17.0-rc}/fpm/config/apcu.config.php | 0 {17.0-beta => 17.0-rc}/fpm/config/apps.config.php | 0 {17.0-beta => 17.0-rc}/fpm/config/autoconfig.php | 0 {17.0-beta => 17.0-rc}/fpm/config/redis.config.php | 0 {17.0-beta => 17.0-rc}/fpm/config/smtp.config.php | 0 {17.0-beta => 17.0-rc}/fpm/cron.sh | 0 {17.0-beta => 17.0-rc}/fpm/entrypoint.sh | 0 {17.0-beta => 17.0-rc}/fpm/upgrade.exclude | 0 29 files changed, 9 insertions(+), 9 deletions(-) rename {17.0-beta => 17.0-rc}/apache/Dockerfile (99%) rename {17.0-beta => 17.0-rc}/apache/config/apache-pretty-urls.config.php (100%) rename {17.0-beta => 17.0-rc}/apache/config/apcu.config.php (100%) rename {17.0-beta => 17.0-rc}/apache/config/apps.config.php (100%) rename {17.0-beta => 17.0-rc}/apache/config/autoconfig.php (100%) rename {17.0-beta => 17.0-rc}/apache/config/redis.config.php (100%) rename {17.0-beta => 17.0-rc}/apache/config/smtp.config.php (100%) rename {17.0-beta => 17.0-rc}/apache/cron.sh (100%) rename {17.0-beta => 17.0-rc}/apache/entrypoint.sh (100%) rename {17.0-beta => 17.0-rc}/apache/upgrade.exclude (100%) rename {17.0-beta => 17.0-rc}/fpm-alpine/Dockerfile (99%) rename {17.0-beta => 17.0-rc}/fpm-alpine/config/apcu.config.php (100%) rename {17.0-beta => 17.0-rc}/fpm-alpine/config/apps.config.php (100%) rename {17.0-beta => 17.0-rc}/fpm-alpine/config/autoconfig.php (100%) rename {17.0-beta => 17.0-rc}/fpm-alpine/config/redis.config.php (100%) rename {17.0-beta => 17.0-rc}/fpm-alpine/config/smtp.config.php (100%) rename {17.0-beta => 17.0-rc}/fpm-alpine/cron.sh (100%) rename {17.0-beta => 17.0-rc}/fpm-alpine/entrypoint.sh (100%) rename {17.0-beta => 17.0-rc}/fpm-alpine/upgrade.exclude (100%) rename {17.0-beta => 17.0-rc}/fpm/Dockerfile (99%) rename {17.0-beta => 17.0-rc}/fpm/config/apcu.config.php (100%) rename {17.0-beta => 17.0-rc}/fpm/config/apps.config.php (100%) rename {17.0-beta => 17.0-rc}/fpm/config/autoconfig.php (100%) rename {17.0-beta => 17.0-rc}/fpm/config/redis.config.php (100%) rename {17.0-beta => 17.0-rc}/fpm/config/smtp.config.php (100%) rename {17.0-beta => 17.0-rc}/fpm/cron.sh (100%) rename {17.0-beta => 17.0-rc}/fpm/entrypoint.sh (100%) rename {17.0-beta => 17.0-rc}/fpm/upgrade.exclude (100%) diff --git a/.travis.yml b/.travis.yml index f93b582..2bc9a81 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,12 +62,12 @@ jobs: - travis_retry ./generate-stackbrew-library.sh - stage: test images - env: VERSION=17.0-beta VARIANT=fpm-alpine ARCH=amd64 - - env: VERSION=17.0-beta VARIANT=fpm-alpine ARCH=i386 - - env: VERSION=17.0-beta VARIANT=fpm ARCH=amd64 - - env: VERSION=17.0-beta VARIANT=fpm ARCH=i386 - - env: VERSION=17.0-beta VARIANT=apache ARCH=amd64 - - env: VERSION=17.0-beta VARIANT=apache ARCH=i386 + env: VERSION=17.0-rc VARIANT=fpm-alpine ARCH=amd64 + - env: VERSION=17.0-rc VARIANT=fpm-alpine ARCH=i386 + - env: VERSION=17.0-rc VARIANT=fpm ARCH=amd64 + - env: VERSION=17.0-rc VARIANT=fpm ARCH=i386 + - env: VERSION=17.0-rc VARIANT=apache ARCH=amd64 + - env: VERSION=17.0-rc VARIANT=apache ARCH=i386 - env: VERSION=14.0 VARIANT=fpm-alpine ARCH=amd64 - env: VERSION=14.0 VARIANT=fpm-alpine ARCH=i386 - env: VERSION=14.0 VARIANT=fpm ARCH=amd64 diff --git a/17.0-beta/apache/Dockerfile b/17.0-rc/apache/Dockerfile similarity index 99% rename from 17.0-beta/apache/Dockerfile rename to 17.0-rc/apache/Dockerfile index f64835c..a6df22f 100644 --- a/17.0-beta/apache/Dockerfile +++ b/17.0-rc/apache/Dockerfile @@ -111,7 +111,7 @@ RUN a2enmod rewrite remoteip ;\ } > /etc/apache2/conf-available/remoteip.conf;\ a2enconf remoteip -ENV NEXTCLOUD_VERSION 17.0.0beta4 +ENV NEXTCLOUD_VERSION 17.0.0RC1 RUN set -ex; \ fetchDeps=" \ diff --git a/17.0-beta/apache/config/apache-pretty-urls.config.php b/17.0-rc/apache/config/apache-pretty-urls.config.php similarity index 100% rename from 17.0-beta/apache/config/apache-pretty-urls.config.php rename to 17.0-rc/apache/config/apache-pretty-urls.config.php diff --git a/17.0-beta/apache/config/apcu.config.php b/17.0-rc/apache/config/apcu.config.php similarity index 100% rename from 17.0-beta/apache/config/apcu.config.php rename to 17.0-rc/apache/config/apcu.config.php diff --git a/17.0-beta/apache/config/apps.config.php b/17.0-rc/apache/config/apps.config.php similarity index 100% rename from 17.0-beta/apache/config/apps.config.php rename to 17.0-rc/apache/config/apps.config.php diff --git a/17.0-beta/apache/config/autoconfig.php b/17.0-rc/apache/config/autoconfig.php similarity index 100% rename from 17.0-beta/apache/config/autoconfig.php rename to 17.0-rc/apache/config/autoconfig.php diff --git a/17.0-beta/apache/config/redis.config.php b/17.0-rc/apache/config/redis.config.php similarity index 100% rename from 17.0-beta/apache/config/redis.config.php rename to 17.0-rc/apache/config/redis.config.php diff --git a/17.0-beta/apache/config/smtp.config.php b/17.0-rc/apache/config/smtp.config.php similarity index 100% rename from 17.0-beta/apache/config/smtp.config.php rename to 17.0-rc/apache/config/smtp.config.php diff --git a/17.0-beta/apache/cron.sh b/17.0-rc/apache/cron.sh similarity index 100% rename from 17.0-beta/apache/cron.sh rename to 17.0-rc/apache/cron.sh diff --git a/17.0-beta/apache/entrypoint.sh b/17.0-rc/apache/entrypoint.sh similarity index 100% rename from 17.0-beta/apache/entrypoint.sh rename to 17.0-rc/apache/entrypoint.sh diff --git a/17.0-beta/apache/upgrade.exclude b/17.0-rc/apache/upgrade.exclude similarity index 100% rename from 17.0-beta/apache/upgrade.exclude rename to 17.0-rc/apache/upgrade.exclude diff --git a/17.0-beta/fpm-alpine/Dockerfile b/17.0-rc/fpm-alpine/Dockerfile similarity index 99% rename from 17.0-beta/fpm-alpine/Dockerfile rename to 17.0-rc/fpm-alpine/Dockerfile index dd56672..2281b9d 100644 --- a/17.0-beta/fpm-alpine/Dockerfile +++ b/17.0-rc/fpm-alpine/Dockerfile @@ -92,7 +92,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 17.0.0beta4 +ENV NEXTCLOUD_VERSION 17.0.0RC1 RUN set -ex; \ apk add --no-cache --virtual .fetch-deps \ diff --git a/17.0-beta/fpm-alpine/config/apcu.config.php b/17.0-rc/fpm-alpine/config/apcu.config.php similarity index 100% rename from 17.0-beta/fpm-alpine/config/apcu.config.php rename to 17.0-rc/fpm-alpine/config/apcu.config.php diff --git a/17.0-beta/fpm-alpine/config/apps.config.php b/17.0-rc/fpm-alpine/config/apps.config.php similarity index 100% rename from 17.0-beta/fpm-alpine/config/apps.config.php rename to 17.0-rc/fpm-alpine/config/apps.config.php diff --git a/17.0-beta/fpm-alpine/config/autoconfig.php b/17.0-rc/fpm-alpine/config/autoconfig.php similarity index 100% rename from 17.0-beta/fpm-alpine/config/autoconfig.php rename to 17.0-rc/fpm-alpine/config/autoconfig.php diff --git a/17.0-beta/fpm-alpine/config/redis.config.php b/17.0-rc/fpm-alpine/config/redis.config.php similarity index 100% rename from 17.0-beta/fpm-alpine/config/redis.config.php rename to 17.0-rc/fpm-alpine/config/redis.config.php diff --git a/17.0-beta/fpm-alpine/config/smtp.config.php b/17.0-rc/fpm-alpine/config/smtp.config.php similarity index 100% rename from 17.0-beta/fpm-alpine/config/smtp.config.php rename to 17.0-rc/fpm-alpine/config/smtp.config.php diff --git a/17.0-beta/fpm-alpine/cron.sh b/17.0-rc/fpm-alpine/cron.sh similarity index 100% rename from 17.0-beta/fpm-alpine/cron.sh rename to 17.0-rc/fpm-alpine/cron.sh diff --git a/17.0-beta/fpm-alpine/entrypoint.sh b/17.0-rc/fpm-alpine/entrypoint.sh similarity index 100% rename from 17.0-beta/fpm-alpine/entrypoint.sh rename to 17.0-rc/fpm-alpine/entrypoint.sh diff --git a/17.0-beta/fpm-alpine/upgrade.exclude b/17.0-rc/fpm-alpine/upgrade.exclude similarity index 100% rename from 17.0-beta/fpm-alpine/upgrade.exclude rename to 17.0-rc/fpm-alpine/upgrade.exclude diff --git a/17.0-beta/fpm/Dockerfile b/17.0-rc/fpm/Dockerfile similarity index 99% rename from 17.0-beta/fpm/Dockerfile rename to 17.0-rc/fpm/Dockerfile index 670b977..d850b7b 100644 --- a/17.0-beta/fpm/Dockerfile +++ b/17.0-rc/fpm/Dockerfile @@ -103,7 +103,7 @@ RUN { \ VOLUME /var/www/html -ENV NEXTCLOUD_VERSION 17.0.0beta4 +ENV NEXTCLOUD_VERSION 17.0.0RC1 RUN set -ex; \ fetchDeps=" \ diff --git a/17.0-beta/fpm/config/apcu.config.php b/17.0-rc/fpm/config/apcu.config.php similarity index 100% rename from 17.0-beta/fpm/config/apcu.config.php rename to 17.0-rc/fpm/config/apcu.config.php diff --git a/17.0-beta/fpm/config/apps.config.php b/17.0-rc/fpm/config/apps.config.php similarity index 100% rename from 17.0-beta/fpm/config/apps.config.php rename to 17.0-rc/fpm/config/apps.config.php diff --git a/17.0-beta/fpm/config/autoconfig.php b/17.0-rc/fpm/config/autoconfig.php similarity index 100% rename from 17.0-beta/fpm/config/autoconfig.php rename to 17.0-rc/fpm/config/autoconfig.php diff --git a/17.0-beta/fpm/config/redis.config.php b/17.0-rc/fpm/config/redis.config.php similarity index 100% rename from 17.0-beta/fpm/config/redis.config.php rename to 17.0-rc/fpm/config/redis.config.php diff --git a/17.0-beta/fpm/config/smtp.config.php b/17.0-rc/fpm/config/smtp.config.php similarity index 100% rename from 17.0-beta/fpm/config/smtp.config.php rename to 17.0-rc/fpm/config/smtp.config.php diff --git a/17.0-beta/fpm/cron.sh b/17.0-rc/fpm/cron.sh similarity index 100% rename from 17.0-beta/fpm/cron.sh rename to 17.0-rc/fpm/cron.sh diff --git a/17.0-beta/fpm/entrypoint.sh b/17.0-rc/fpm/entrypoint.sh similarity index 100% rename from 17.0-beta/fpm/entrypoint.sh rename to 17.0-rc/fpm/entrypoint.sh diff --git a/17.0-beta/fpm/upgrade.exclude b/17.0-rc/fpm/upgrade.exclude similarity index 100% rename from 17.0-beta/fpm/upgrade.exclude rename to 17.0-rc/fpm/upgrade.exclude From 7d0e49e5dd0ad4d721492ab04fde33111256d301 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 12 Sep 2019 11:01:37 +0200 Subject: [PATCH 2/2] Exclude failing builds Signed-off-by: Tilo Spannagel --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2bc9a81..42330d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,10 @@ jobs: allow_failures: - env: VERSION=15.0 VARIANT=apache ARCH=i386 - env: VERSION=16.0 VARIANT=apache ARCH=i386 + - env: VERSION=17.0 VARIANT=apache ARCH=i386 - env: VERSION=15.0-rc VARIANT=apache ARCH=i386 - env: VERSION=16.0-rc VARIANT=apache ARCH=i386 + - env: VERSION=17.0-rc VARIANT=apache ARCH=i386 - env: VERSION=17.0-beta VARIANT=apache ARCH=i386 include: - &test-scripts