jenkins-bot has submitted this change and it was merged. Change subject: maintenance: Have update-oojs-ui.sh update composer.json too ......................................................................
maintenance: Have update-oojs-ui.sh update composer.json too Change-Id: Ifa37c9dcd136051c5ab8967f7ba1e490a5aa7861 --- M maintenance/resources/update-oojs-ui.sh 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Ori.livneh: Looks good to me, approved Legoktm: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/maintenance/resources/update-oojs-ui.sh b/maintenance/resources/update-oojs-ui.sh index 93aacde..88d9f87 100755 --- a/maintenance/resources/update-oojs-ui.sh +++ b/maintenance/resources/update-oojs-ui.sh @@ -15,6 +15,7 @@ # Prepare working tree cd "$REPO_DIR" && +git reset composer.json && git checkout composer.json && git reset $TARGET_DIR && git checkout $TARGET_DIR && git fetch origin && git checkout -B upstream-oojs-ui origin/master || exit 1 @@ -58,5 +59,8 @@ END ) +# Update composer.json as well +composer require oojs/oojs-ui $OOJSUI_VERSION --no-update + # Stage deletion, modification and creation of files. Then commit. -git add --update $TARGET_DIR && git add $TARGET_DIR && git commit -m "$COMMITMSG" || exit 1 +git add --update $TARGET_DIR && git add $TARGET_DIR && git add composer.json && git commit -m "$COMMITMSG" || exit 1 -- To view, visit https://gerrit.wikimedia.org/r/180379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa37c9dcd136051c5ab8967f7ba1e490a5aa7861 Gerrit-PatchSet: 5 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Jforrester <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: Legoktm <[email protected]> Gerrit-Reviewer: Ori.livneh <[email protected]> Gerrit-Reviewer: Parent5446 <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
