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

Change subject: Attempt to fix TravisCI build
......................................................................


Attempt to fix TravisCI build

Change-Id: Id9b9c6037e980219af1f6cd536165942918cfcc1
(cherry picked from commit 826a3c1828c25aea515b40bc5786bfd4ece32c14)
---
M .travis.sh
1 file changed, 12 insertions(+), 9 deletions(-)

Approvals:
  Jeroen De Dauw: Verified; Looks good to me, approved



diff --git a/.travis.sh b/.travis.sh
index 6e8e3b9..2ad5ab5 100644
--- a/.travis.sh
+++ b/.travis.sh
@@ -2,24 +2,27 @@
 
 set -x
 
-originalDirectory=$(pwd)
-
 cd ..
 
 git clone https://gerrit.wikimedia.org/r/p/mediawiki/core.git phase3 --depth 1
 
-cd phase3
+cd -
+cd ../phase3/extensions
+
+mkdir WikibaseQuery
+
+cd -
+cp -r * ../phase3/extensions/WikibaseQuery
+
+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
 
-composer require wikibase/query:dev-master
+cd extensions/WikibaseQuery
+composer install
 
-# Replace WikibaseQuery with the version that should be tested
-rm -rf WikibaseQuery
-mkdir WikibaseQuery
-cp -r $originalDirectory/* WikibaseQuery
-
+cd ../..
 echo 'require_once( __DIR__ . "/vendor/wikibase/wikibase/repo/Wikibase.php" 
);' >> LocalSettings.php
 echo 'require_once( __DIR__ . 
"/vendor/wikibase/wikibase/repo/ExampleSettings.php" );' >> LocalSettings.php
 echo 'require_once( __DIR__ . "/vendor/wikibase/query/WikibaseQuery.php" );' 
>> LocalSettings.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id9b9c6037e980219af1f6cd536165942918cfcc1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/WikibaseQuery
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

Reply via email to