[MediaWiki-commits] [Gerrit] Improve TravisCI build script - change (mediawiki...WikibaseQueryEngine)

[Jeroen De Dauw (Code Review)]

Jeroen De Dauw has submitted this change and it was merged.

Change subject: Improve TravisCI build script
......................................................................


Improve TravisCI build script

Change-Id: I0868ad4ff3248a8be3c2ec997951c34df47f14c0
---
M .travis.sh
M .travis.yml
2 files changed, 9 insertions(+), 15 deletions(-)

Approvals:
  Jeroen De Dauw: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.travis.sh b/.travis.sh
index 291c9eb..b922d0b 100644
--- a/.travis.sh
+++ b/.travis.sh
@@ -8,19 +8,17 @@
        phpunit --testsuite=QueryEngine
 else
        cd ..
-       pwd
        git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git phase3 
--depth 1
+
        cd phase3
        mysql -e 'create database its_a_mw;'
-       php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname 
its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin
+
        cd extensions
-       git clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Diff.git
-       git clone 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/DataValues.git
-       git clone https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Ask.git
-       git clone 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/Wikibase.git
-       git clone 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseDataModel.git
-       git clone 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseDatabase.git
-       git clone 
https://gerrit.wikimedia.org/r/p/mediawiki/extensions/WikibaseQueryEngine.git
-       cd WikibaseQueryEngine
+       composer create-project wikibase/query-engine:dev-master 
WikibaseQueryEngine --keep-vcs
+
+       cd ..
+       php maintenance/install.php --dbtype $DBTYPE --dbuser root --dbname 
its_a_mw --dbpath $(pwd) --pass nyan TravisWiki admin
+
+       cd extensions/WikibaseQueryEngine
        phpunit
 fi
diff --git a/.travis.yml b/.travis.yml
index 9b55ddb..9c7525f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,11 +26,7 @@
     - php: 5.3
       env: DBTYPE=sqlite STANDALONE=yeah
 
-
-before_script:
-  - bash .travis.sh $STANDALONE
-
-script: true
+script: bash .travis.sh $STANDALONE
 
 notifications:
   email:

-- 
To view, visit https://gerrit.wikimedia.org/r/69291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0868ad4ff3248a8be3c2ec997951c34df47f14c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQueryEngine
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits