Skip to content

Commit e5bcb9e

Browse files
JeroenDeDauwclaude
andcommitted
Fix CI for MW master: tolerate absent Wikibase JS submodules
The MW master CI job aborted in installMediaWiki.sh with exit 128: fatal: no submodule mapping found in .gitmodules for path 'view/lib/wikibase-serialization' Wikibase master removed the wikibase-serialization, wikibase-data-values and wikibase-data-model view-layer submodules (migrated to npm), so `git submodule set-url` on those paths fails. Under `set -e` this aborted the install before PHPUnit ran, and fail-fast then cancelled every other matrix job. These JS libraries are not needed by the PHP test suite. Make the URL rewrites tolerant of an absent submodule so the script no longer aborts on master, while behaviour on REL1_43/44/45 (where the submodules still exist) is unchanged. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 038c781 commit e5bcb9e

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

.github/workflows/installMediaWiki.sh

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,15 @@ cd extensions
6060
git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Elastica --depth=1 --branch=$MW_BRANCH --recurse-submodules -j8
6161
git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/CirrusSearch --depth=1 --branch=$MW_BRANCH --recurse-submodules -j8
6262

63-
git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase --depth=1 --branch=$MW_BRANCH -j8 && \
64-
cd Wikibase && \
65-
git submodule set-url view/lib/wikibase-serialization https://github.com/wmde/WikibaseSerializationJavaScript.git && \
66-
git submodule set-url view/lib/wikibase-data-values https://github.com/wmde/DataValuesJavaScript.git && \
67-
git submodule set-url view/lib/wikibase-data-model https://github.com/wmde/WikibaseDataModelJavaScript.git && \
68-
git submodule sync && git submodule init && git submodule update --recursive
63+
git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase --depth=1 --branch=$MW_BRANCH -j8
64+
cd Wikibase
65+
66+
# The wikibase-serialization, wikibase-data-values and wikibase-data-model submodules point at
67+
# Phabricator URLs that are unreliable in CI, so rewrite them to GitHub mirrors. These submodules
68+
# only exist on the REL branches; MediaWiki master removed them (migrated to npm), so skip silently
69+
# when absent instead of aborting the build.
70+
git submodule set-url view/lib/wikibase-serialization https://github.com/wmde/WikibaseSerializationJavaScript.git 2>/dev/null || true
71+
git submodule set-url view/lib/wikibase-data-values https://github.com/wmde/DataValuesJavaScript.git 2>/dev/null || true
72+
git submodule set-url view/lib/wikibase-data-model https://github.com/wmde/WikibaseDataModelJavaScript.git 2>/dev/null || true
73+
74+
git submodule sync && git submodule init && git submodule update --recursive

0 commit comments

Comments
 (0)