[MediaWiki-commits] [Gerrit] Replace perl inline with proper script - change (integration/config)

2015-07-28 Thread JanZerebecki (Code Review) 
JanZerebecki has uploaded a new change for review.

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

Change subject: Replace perl inline with proper script
..

Replace perl inline with proper script

Bug: T106433
Change-Id: I7a335d4e6009b203b03bb89900a968b90b2b92c4
---
M jjb/wikidata.yaml
1 file changed, 1 insertion(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/25/227625/1

diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 35600ab..8ad0b49 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -4,10 +4,7 @@
 - shell: |
 set -eu
 cd "$WORKSPACE/src/"
-cat ../deps.txt | perl -ne '
-  BEGIN { print "{ \"extra\": { \"merge-plugin\": { \"include\": 
["; $lineend=""; };
-  if ( /^mediawiki\/extensions/ ) { s/^mediawiki\///; 
s/\n/\/composer.json/; $print="$lineend\n\"$_\""; $lineend=","; print $print }
-  END{ print "\n] } } }\n" };' > composer.local.json
+
/srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py 
../deps.txt composer.local.json
 timeout 300 composer update --prefer-source -vvv
 # FIXME BUG the first run just exits without error without 
finishing especially in a clean working copy
 timeout 300 composer update --prefer-source -vvv

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a335d4e6009b203b03bb89900a968b90b2b92c4
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki 

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

[MediaWiki-commits] [Gerrit] Replace perl inline with proper script - change (integration/config)

2015-07-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Replace perl inline with proper script
..


Replace perl inline with proper script

Bug: T106433
Change-Id: I7a335d4e6009b203b03bb89900a968b90b2b92c4
---
M jjb/wikidata.yaml
1 file changed, 1 insertion(+), 4 deletions(-)

Approvals:
  JanZerebecki: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/wikidata.yaml b/jjb/wikidata.yaml
index 35600ab..8ad0b49 100644
--- a/jjb/wikidata.yaml
+++ b/jjb/wikidata.yaml
@@ -4,10 +4,7 @@
 - shell: |
 set -eu
 cd "$WORKSPACE/src/"
-cat ../deps.txt | perl -ne '
-  BEGIN { print "{ \"extra\": { \"merge-plugin\": { \"include\": 
["; $lineend=""; };
-  if ( /^mediawiki\/extensions/ ) { s/^mediawiki\///; 
s/\n/\/composer.json/; $print="$lineend\n\"$_\""; $lineend=","; print $print }
-  END{ print "\n] } } }\n" };' > composer.local.json
+
/srv/deployment/integration/slave-scripts/bin/mw-create-composer-local.py 
../deps.txt composer.local.json
 timeout 300 composer update --prefer-source -vvv
 # FIXME BUG the first run just exits without error without 
finishing especially in a clean working copy
 timeout 300 composer update --prefer-source -vvv

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a335d4e6009b203b03bb89900a968b90b2b92c4
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: jenkins-bot <>

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