Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/237482

Change subject: Force composer color with --ansi
......................................................................

Force composer color with --ansi

While running under Jenkins, composer disables color output entirely.
Our jobs have the ANSI wrapper which convert the sequences to CSS which
result in coloring in the console output.

Add --ansi to any composer command that missed it.

Change-Id: I04611561dc40f6ea79d4f7f4fe6434a8cdc69d8a
---
M jjb/macro.yaml
M jjb/mediawiki-tools.yaml
M jjb/parsoidsvc.yaml
M jjb/wikidata.yaml
4 files changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/82/237482/1

diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index ae325a1..4aae10f 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -638,17 +638,17 @@
     name: composer-update
     builders:
      - shell: |
-        composer update --no-progress --prefer-dist --profile
+        composer update --ansi --no-progress --prefer-dist --profile
 
 - builder:
     name: composer-update-no-dev
     builders:
      - shell: |
-        composer update --no-progress --prefer-dist --profile --no-dev
+        composer update --ansi --no-progress --prefer-dist --profile --no-dev
 
 # Runs "composer test"
 - builder:
     name: composer-test
     builders:
      - shell: |
-        composer test
+        composer --ansi test
diff --git a/jjb/mediawiki-tools.yaml b/jjb/mediawiki-tools.yaml
index 0563429..5778e8c 100644
--- a/jjb/mediawiki-tools.yaml
+++ b/jjb/mediawiki-tools.yaml
@@ -41,5 +41,5 @@
              mediawiki/tools/codesniffer
      - shell: |
         cd $WORKSPACE/src/mediawiki/tools/codesniffer
-        composer update --no-progress --prefer-dist --profile
+        composer --ansi update --no-progress --prefer-dist --profile
         vendor/bin/phpcs --standard=./MediaWiki --extensions=php,php5,inc -p 
../../../includes
diff --git a/jjb/parsoidsvc.yaml b/jjb/parsoidsvc.yaml
index 74db7a9..6066938 100644
--- a/jjb/parsoidsvc.yaml
+++ b/jjb/parsoidsvc.yaml
@@ -29,7 +29,7 @@
         - shell: |
             # Fetch external dependencies using composer
             cd src/mediawiki/core
-            composer update
+            composer --ansi update
             # Install MediaWiki in a different directory
             export MW_INSTALL_PATH='src/mediawiki/core'
             /srv/deployment/integration/slave-scripts/bin/mw-install-sqlite.sh
diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 3f3d8a9..0bb3159 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -5,7 +5,7 @@
             set -eu
             cd "$WORKSPACE/src/"
             
/srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py 
../deps.txt composer.local.json
-            timeout 300 composer update --prefer-source -vvv
+            timeout 300 composer --ansi update --prefer-source -vvv
 
 - builder:
     name: wd-wikibase-apply-settings

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04611561dc40f6ea79d4f7f4fe6434a8cdc69d8a
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>

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

Reply via email to