Aude has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/354522 )

Change subject: Add composer-install & use in composer-test-mwextension
......................................................................

Add composer-install & use in composer-test-mwextension

If something has composer.lock, then keep what is
installed at those versions, else this would install/update
with fresh dependencies.

For things like "Wikidata" extension, composer update
has already been run and this contains build results,
with composer.lock. In this case, we don't want to run
composer update again here, and want to test it as-is.

Change-Id: I4a491c4147b51e3f10d07a35adaa1604abaedde3
---
M jjb/macro.yaml
M jjb/mediawiki-extensions.yaml
2 files changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/22/354522/1

diff --git a/jjb/macro.yaml b/jjb/macro.yaml
index 6206560..5a0dad2 100644
--- a/jjb/macro.yaml
+++ b/jjb/macro.yaml
@@ -594,6 +594,15 @@
         composer update --ansi --no-progress --prefer-dist --profile -v
 
 - builder:
+    name: composer-install
+    builders:
+     - shell: |
+        set -u
+        cd "{dir}"
+        [[ -f "composer.json" ]] || exit 0
+        composer install --ansi --no-progress --prefer-dist --profile -v
+
+- builder:
     name: composer-update-no-dev
     builders:
      - shell: |
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index e9cd2aa..d35bfcd 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -239,7 +239,7 @@
     builders:
      - composer-validate:
          dir: 'src/extensions/$EXT_NAME'
-     - composer-update:
+     - composer-install:
          dir: 'src/extensions/$EXT_NAME'
      - composer-test:
          dir: 'src/extensions/$EXT_NAME'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a491c4147b51e3f10d07a35adaa1604abaedde3
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
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

Reply via email to