Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/123863
Change subject: Add option in travis setup to run client or repo tests only, or
both
......................................................................
Add option in travis setup to run client or repo tests only, or both
Change-Id: I2bb1ef1c629b7c9b04beb4e83bc4d187d867d302
---
M .travis.yml
D build/travis/before_script.sh
A build/travis/install.sh
A build/travis/mw-apply-wb-settings.sh
A build/travis/update-db.sh
5 files changed, 89 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/63/123863/1
diff --git a/.travis.yml b/.travis.yml
index 232ebbc..b1ec644 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,9 +22,13 @@
exclude:
- env: THENEEDFORTHIS=FAIL
-before_script: bash ./build/travis/before_script.sh
+before_script:
+ - bash ./build/travis/install.sh
+ - bash ./build/travis/mw-apply-wb-settings.sh
+ - bash ./build/travis/update-db.sh
-script: bash ./build/travis/script.sh
+script:
+ - bash ./build/travis/script.sh
notifications:
email:
diff --git a/build/travis/before_script.sh b/build/travis/before_script.sh
deleted file mode 100644
index 6333755..0000000
--- a/build/travis/before_script.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/bash
-
-set -x
-
-originalDirectory=$(pwd)
-
-cd ..
-
-wget https://github.com/wikimedia/mediawiki-core/archive/$MW.tar.gz
-tar -zxf $MW.tar.gz
-mv mediawiki-core-$MW phase3
-
-cd phase3
-
-git checkout $MW
-
-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/Scribunto.git
--depth 1
-
-cp -r $originalDirectory Wikibase
-
-cd Wikibase
-composer install --prefer-source
-
-cd ../..
-
-echo 'error_reporting(E_ALL| E_STRICT);' >> LocalSettings.php
-echo 'ini_set("display_errors", 1);' >> LocalSettings.php
-echo '$wgShowExceptionDetails = true;' >> LocalSettings.php
-echo '$wgDevelopmentWarnings = true;' >> LocalSettings.php
-echo '$wgLanguageCode = "'$LANG'";' >> LocalSettings.php
-
-echo "define( 'WB_EXPERIMENTAL_FEATURES', true );" >> LocalSettings.php
-echo 'require_once __DIR__ . "/extensions/Wikibase/repo/Wikibase.php";' >>
LocalSettings.php
-echo 'require_once __DIR__ . "/extensions/Wikibase/repo/ExampleSettings.php";'
>> LocalSettings.php
-echo 'require_once __DIR__ .
"/extensions/Wikibase/client/WikibaseClient.php";' >> LocalSettings.php
-echo 'require_once __DIR__ . "/extensions/Scribunto/Scribunto.php";' >>
LocalSettings.php
-echo '$wgWBClientSettings["siteGlobalID"] = "enwiki";' >> LocalSettings.php
-
-php maintenance/update.php --quick
diff --git a/build/travis/install.sh b/build/travis/install.sh
new file mode 100644
index 0000000..92029d3
--- /dev/null
+++ b/build/travis/install.sh
@@ -0,0 +1,29 @@
+#! /bin/bash
+
+set -x
+
+originalDirectory=$(pwd)
+
+cd ..
+
+wget https://github.com/wikimedia/mediawiki-core/archive/$MW.tar.gz
+tar -zxf $MW.tar.gz
+mv mediawiki-core-$MW phase3
+
+cd phase3
+
+git checkout $MW
+
+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/Scribunto.git
--depth 1
+
+cp -r $originalDirectory Wikibase
+
+cd Wikibase
+
+composer self-update
+composer install --prefer-source
diff --git a/build/travis/mw-apply-wb-settings.sh
b/build/travis/mw-apply-wb-settings.sh
new file mode 100644
index 0000000..ce84de4
--- /dev/null
+++ b/build/travis/mw-apply-wb-settings.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+set -x
+
+cd ../phase3
+
+function apply_client_settings {
+ echo '$wgEnableWikibaseRepo = false;' >> LocalSettings.php
+ echo '$wgEnableWikibaseClient = true;' >> LocalSettings.php
+ echo 'require_once __DIR__ .
"/extensions/Wikibase/client/WikibaseClient.php";' >> LocalSettings.php
+ echo 'require_once __DIR__ .
"/extensions/Wikibase/client/ExampleSettings.php";' >> LocalSettings.php
+}
+
+function apply_repo_settings {
+ echo '$wgEnableWikibaseRepo = true;' >> LocalSettings.php
+ echo '$wgEnableWikibaseClient = false;' >> LocalSettings.php
+ echo 'require_once __DIR__ . "/extensions/Wikibase/repo/Wikibase.php";' >>
LocalSettings.php
+ echo 'require_once __DIR__ .
"/extensions/Wikibase/repo/ExampleSettings.php";' >> LocalSettings.php
+}
+
+function apply_common_settings {
+ echo 'error_reporting(E_ALL| E_STRICT);' >> LocalSettings.php
+ echo 'ini_set("display_errors", 1);' >> LocalSettings.php
+ echo '$wgShowExceptionDetails = true;' >> LocalSettings.php
+ echo '$wgDevelopmentWarnings = true;' >> LocalSettings.php
+ echo '$wgLanguageCode = "'$LANG'";' >> LocalSettings.php
+ echo '$wgDebugLogFile = "mw-debug.log";' >> LocalSettings.php
+}
+
+function apply_experimental_settings {
+ echo "define( 'WB_EXPERIMENTAL_FEATURES', 1 );" >> LocalSettings.php
+}
+
+apply_common_settings
+apply_experimental_settings
+
+if [ "$WB" = "repo" ]
+then
+ apply_repo_settings
+elif [ "$WB" = "client" ]
+then
+ apply_client_settings
+else
+ apply_repo_settings
+ apply_client_settings
+fi
diff --git a/build/travis/update-db.sh b/build/travis/update-db.sh
new file mode 100644
index 0000000..b78074c
--- /dev/null
+++ b/build/travis/update-db.sh
@@ -0,0 +1,8 @@
+#! /bin/bash
+
+set -x
+
+pwd
+cd ../phase3
+
+php maintenance/update.php --quick
--
To view, visit https://gerrit.wikimedia.org/r/123863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2bb1ef1c629b7c9b04beb4e83bc4d187d867d302
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude <aude.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
