From 9b9190c02fac5f4430f6df24b225369b331cdca1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 12 Oct 2019 17:37:22 +0200 Subject: [PATCH] update location of installscript and parameters for ci/cd MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Felix Nüsse --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3f816a8..a599c005 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,8 @@ env: - SERVER_FOLDER=server - CLOUD=nextcloud matrix: - - DB=mysql - - DB=sqlite + - DB=mysql SERVER=nextcloud/travis_ci/master + - DB=sqlite SERVER=nextcloud/travis_ci/master branches: only: @@ -24,9 +24,8 @@ before_install: - sh -e /etc/init.d/xvfb start # <- if [[ "$DB" == 'mysql' ]]; then sudo apt-get -y install mariadb-server; fi # - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh - - sh -c "if [ '$CLOUD' = 'nextcloud' ]; then wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh; fi;" - - sh -c "if [ '$CLOUD' = 'owncloud' ]; then wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install.sh; fi;" - - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB + - wget https://raw.githubusercontent.com/$SERVER/before_install.sh + - . ./before_install.sh "$APP_NAME" "$CORE_BRANCH" "$DB" # Add some output debugging information - cd ../${SERVER_FOLDER} - ./occ check