dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Revert "Log the reason why revision->getContent() returns null""
[lhc/web/wiklou.git]
/
maintenance
/
resources
/
update-oojs-ui.sh
diff --git
a/maintenance/resources/update-oojs-ui.sh
b/maintenance/resources/update-oojs-ui.sh
index
799af4c
..
d1e6496
100755
(executable)
--- a/
maintenance/resources/update-oojs-ui.sh
+++ b/
maintenance/resources/update-oojs-ui.sh
@@
-1,6
+1,6
@@
#!/bin/bash -eu
#!/bin/bash -eu
-# This script generates a commit that updates our copy of OO
js
UI
+# This script generates a commit that updates our copy of OOUI
if [ -n "${2:-}" ]
then
if [ -n "${2:-}" ]
then
@@
-20,7
+20,7
@@
git checkout composer.json
git reset -- $TARGET_DIR
git checkout -- $TARGET_DIR
git fetch origin
git reset -- $TARGET_DIR
git checkout -- $TARGET_DIR
git fetch origin
-git checkout -B upstream-oo
js-
ui origin/master
+git checkout -B upstream-ooui origin/master
# Fetch upstream version
cd $NPM_DIR
# Fetch upstream version
cd $NPM_DIR
@@
-31,10
+31,10
@@
else
npm install oojs-ui
fi
npm install oojs-ui
fi
-OO
JS
UI_VERSION=$(node -e 'console.log(require("./node_modules/oojs-ui/package.json").version);')
-if [ "$OO
JS
UI_VERSION" == "" ]
+OOUI_VERSION=$(node -e 'console.log(require("./node_modules/oojs-ui/package.json").version);')
+if [ "$OOUI_VERSION" == "" ]
then
then
- echo 'Could not find OO
js
UI version'
+ echo 'Could not find OOUI version'
exit 1
fi
exit 1
fi
@@
-68,15
+68,15
@@
rm -rf "$NPM_DIR"
cd $REPO_DIR
COMMITMSG=$(cat <<END
cd $REPO_DIR
COMMITMSG=$(cat <<END
-Update OO
js UI to v$OOJS
UI_VERSION
+Update OO
UI to v$OO
UI_VERSION
Release notes:
Release notes:
- https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v$OO
JS
UI_VERSION
+ https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v$OOUI_VERSION
END
)
# Update composer.json as well
END
)
# Update composer.json as well
-composer require oojs/oojs-ui $OO
JS
UI_VERSION --no-update
+composer require oojs/oojs-ui $OOUI_VERSION --no-update
# Stage deletion, modification and creation of files. Then commit.
git add --update $TARGET_DIR
# Stage deletion, modification and creation of files. Then commit.
git add --update $TARGET_DIR