JanZerebecki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/297126
Change subject: Fix dirty VisualEditor submodule
......................................................................
Fix dirty VisualEditor submodule
This fixes dirty VisualEditor submodule so that if a build is stoped in
the middle it will clean the repo up so that it is clean the next time the
build is started.
Bug: T121479
Change-Id: I2501dd150d6df851bd47bae606f3b0ce991d2940
---
M jjb/mediawiki-extensions.yaml
1 file changed, 8 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/26/297126/1
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index b9bd08e..ac67ac3 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -58,18 +58,19 @@
- zuul-cloner:
projects: >
$(cat deps.txt)
- - ve-submodules-update
+ - ve-submodules-update:
+ repository-list-file: 'deps.txt'
# Workaround zuul-cloner not processing submodules
- builder:
name: ve-submodules-update
builders:
- shell: |
- if grep -q mediawiki/extensions/VisualEditor deps.txt; then
+ if grep -q mediawiki/extensions/VisualEditor
"{repository-list-file}"; then
cd src/extensions/VisualEditor
+ git submodule foreach git clean -xdff -q
git submodule update --init
git submodule status
- git submodule foreach git clean -xdff -q
fi
# ALWAYS pair with 'mw-teardown-mysql'
@@ -86,11 +87,8 @@
mediawiki/vendor
$(cat extensions_load.txt)
- shell: "mv extensions_load.txt src/extensions_load.txt"
- - shell: |
- if grep -q mediawiki/extensions/VisualEditor src/extensions_load.txt;
then
- cd src/extensions/VisualEditor
- git submodule update --init
- fi
+ - ve-submodules-update:
+ repository-list-file: 'src/extensions_load.txt'
- mw-install-mysql
- mw-apply-settings
- mw-run-update-script
@@ -105,11 +103,8 @@
mediawiki/core
$(cat extensions_load.txt)
- shell: "mv extensions_load.txt src/extensions_load.txt"
- - shell: |
- if grep -q mediawiki/extensions/VisualEditor src/extensions_load.txt;
then
- cd src/extensions/VisualEditor
- git submodule update --init
- fi
+ - ve-submodules-update:
+ repository-list-file: 'src/extensions_load.txt'
- composer-validate:
dir: 'src'
- composer-local-create:
--
To view, visit https://gerrit.wikimedia.org/r/297126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2501dd150d6df851bd47bae606f3b0ce991d2940
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: JanZerebecki <jan.wikime...@zerebecki.de>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
