diff options
| author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2018-09-19 09:35:56 +0300 |
|---|---|---|
| committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2018-09-19 09:35:56 +0300 |
| commit | 8be432b0573f43b743f5a3f86a19550842808b91 (patch) | |
| tree | a6f12c76c47792a6440fd8b71e985b9d14fcff8d /.travis.yml | |
| parent | 399a36c4813d32ad8bc5006bcde94e3e215d4726 (diff) | |
| parent | ed638a4e18c2e8fc5dcd2a67d3aac3ec87c5bc9e (diff) | |
Merge branch 'master' of github.com:/ChristophWurst/twofactor_sms into fix/test-coverage-failure
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index f7213fb..08b92e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,11 @@ language: php php: - 7.0 - 7.1 + - 7.2 env: global: - - CORE_BRANCH=master + - SERVER_BRANCH=master - PHP_COVERAGE=FALSE matrix: - DB=sqlite @@ -31,7 +32,7 @@ before_install: - composer self-update - composer install - cd .. - - git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $CORE_BRANCH core + - git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $SERVER_BRANCH core - mv twofactor_gateway core/apps/ before_script: @@ -61,9 +62,10 @@ after_script: matrix: include: - - php: 7.0 - env: "DB=sqlite CORE_BRANCH=v14.0.0beta2" # replace with `stable14` once available + - php: 7.2 + env: "DB=sqlite SERVER_BRANCH=v14.0.0" + - php: 7.2 + env: "DB=sqlite SERVER_BRANCH=stable14" - php: 7.2 env: "DB=sqlite PHP_COVERAGE=TRUE" fast_finish: true - |