jenkins-bot has submitted this change and it was merged. Change subject: Use :8080 in Makefile and tasks as default url ......................................................................
Use :8080 in Makefile and tasks as default url When first installing mediawiki with vagrant it exposes :8080 by default, so make tasks should use that port by default Change-Id: I4924cf86f4e09f8c880386b0bfc0b0d7371c600a --- M Makefile M dev-scripts/cachedpage.sh M dev-scripts/qunit.sh M dev-scripts/validatehtml.sh 4 files changed, 4 insertions(+), 4 deletions(-) Approvals: Jdlrobson: Looks good to me, approved Bmansurov: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/Makefile b/Makefile index 263df88..c603ed1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ MW_INSTALL_PATH ?= ../.. -MEDIAWIKI_LOAD_URL ?= http://localhost/w/load.php +MEDIAWIKI_LOAD_URL ?= http://localhost:8080/w/load.php # From https://gist.github.com/prwhite/8168133 help: ## Show this help message diff --git a/dev-scripts/cachedpage.sh b/dev-scripts/cachedpage.sh index 21698a0..5187335 100755 --- a/dev-scripts/cachedpage.sh +++ b/dev-scripts/cachedpage.sh @@ -21,7 +21,7 @@ #Generate the 'cached' pages mkdir -p tmp -URL=${MEDIAWIKI_URL:-"http://127.0.0.1:80/w/index.php/"} +URL=${MEDIAWIKI_URL:-"http://127.0.0.1:8080/w/index.php/"} TITLE=${2:="Main_Page"} echo "Using $URL as a development environment host." echo "To specify a different host set MEDIAWIKI_URL environment variable" diff --git a/dev-scripts/qunit.sh b/dev-scripts/qunit.sh index c6cb648..265ae1b 100755 --- a/dev-scripts/qunit.sh +++ b/dev-scripts/qunit.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash echo "Running QUnit tests..." if command -v phantomjs > /dev/null ; then - URL=${MEDIAWIKI_URL:-"http://127.0.0.1:80/w/index.php/"} + URL=${MEDIAWIKI_URL:-"http://127.0.0.1:8080/w/index.php/"} if [ -z "$1" ]; then FILTER="" else diff --git a/dev-scripts/validatehtml.sh b/dev-scripts/validatehtml.sh index 83a5d65..273dc01 100755 --- a/dev-scripts/validatehtml.sh +++ b/dev-scripts/validatehtml.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash mkdir -p tmp TITLE=${1:-"W3CValidationTest"} -URL=${MEDIAWIKI_URL:-"http://127.0.0.1:80/w/index.php/"} +URL=${MEDIAWIKI_URL:-"http://127.0.0.1:8080/w/index.php/"} curl -sG "$URL$TITLE?useformat=mobile" > tmp/validate.html curl -sF "uploaded_file=@tmp/validate.html;type=text/html" -F output=json http://validator.w3.org/check > tmp/validate.json -- To view, visit https://gerrit.wikimedia.org/r/167970 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4924cf86f4e09f8c880386b0bfc0b0d7371c600a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jhernandez <[email protected]> Gerrit-Reviewer: Awjrichards <[email protected]> Gerrit-Reviewer: Bmansurov <[email protected]> Gerrit-Reviewer: Jdlrobson <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
