From ffc39bf3c9838d56fea73365433a5f9663e38751 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 21 Sep 2020 12:44:21 +0200 Subject: [PATCH 1/3] Update version on master Signed-off-by: Joas Schilling --- .travis.yml | 3 ++- appinfo/info.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f403b92..2314771 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: false language: php php: - - 7.2 - 7.3 - 7.4 @@ -36,6 +35,8 @@ matrix: env: DB=mysql - php: 7.3 env: DB=pgsql + - php: 7.2 + env: CORE_BRANCH=stable20 fast_finish: true before_install: diff --git a/appinfo/info.xml b/appinfo/info.xml index d6a4a57..6eacdd3 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -35,7 +35,7 @@ This app allows users to register a new account. https://raw.githubusercontent.com/nextcloud/registration/master/docs/demo.gif https://raw.githubusercontent.com/nextcloud/registration/master/docs/admin-settings.png - + OCA\Registration\Settings\RegistrationSettings From e965ebff11ae7accbf39bbb0716893d7a42030fc Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 21 Sep 2020 13:20:16 +0200 Subject: [PATCH 2/3] Specify the DB and correctly overwrite the core branch Signed-off-by: Joas Schilling --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2314771..2c50d3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,9 @@ addons: env: global: - - CORE_BRANCH=master - APP_NAME=registration matrix: + - CORE_BRANCH=master - DB=sqlite branches: @@ -36,7 +36,7 @@ matrix: - php: 7.3 env: DB=pgsql - php: 7.2 - env: CORE_BRANCH=stable20 + env: DB=sqlite;CORE_BRANCH=stable20 fast_finish: true before_install: From 38a9aba21fde697379dc7e5cf8ca52fb58d14cf2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 21 Sep 2020 13:41:41 +0200 Subject: [PATCH 3/3] Like this? Signed-off-by: Joas Schilling --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2c50d3b..fd1cc86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,9 +20,9 @@ addons: env: global: - APP_NAME=registration - matrix: - CORE_BRANCH=master - DB=sqlite + matrix: branches: only: @@ -36,7 +36,7 @@ matrix: - php: 7.3 env: DB=pgsql - php: 7.2 - env: DB=sqlite;CORE_BRANCH=stable20 + env: CORE_BRANCH=stable20 fast_finish: true before_install: