Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/125430
Change subject: grunt: Make grunt basedir and Gruntfile.js parent dir the same
......................................................................
grunt: Make grunt basedir and Gruntfile.js parent dir the same
The new grunt-cli version no longer supports having gruntfile
in one dir and node_modules/grunt in a completely different path.
This actually makes sense and was an undocumented feature to begin
with that we didn't even intend to make use of. The files should
both be in tools/, just like package.json.
Keeping symlink just for paranoia.
Change-Id: I04d8e308daedb3ccb80d18b9a7ae96eb776bbbdf
---
M bin/wmfgrunt
A jobs/_shared/gruntfile.js
R tools/Gruntfile.js
3 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins
refs/changes/30/125430/1
diff --git a/bin/wmfgrunt b/bin/wmfgrunt
index 6392794..e37c416 100755
--- a/bin/wmfgrunt
+++ b/bin/wmfgrunt
@@ -10,9 +10,9 @@
# an absolute path using pwd. The ksh equivalent is `whence`
BASE_DIR=$(cd $(dirname $0)/..; pwd)
-# Paths to grunt script and CI gruntfile:
+# Paths to grunt-cli bin shared gruntfile:
GRUNT_BIN="$BASE_DIR/bin/grunt"
-GRUNT_FILE="$BASE_DIR/jobs/_shared/gruntfile.js"
+GRUNT_FILE="$BASE_DIR/tools/Gruntfile.js"
if [ ! -e "$GRUNT_BIN" -o ! -e "$GRUNT_FILE" ]; then
echo "Either grunt or gruntfile.js could not be found. Expected:"
diff --git a/jobs/_shared/gruntfile.js b/jobs/_shared/gruntfile.js
new file mode 120000
index 0000000..b84f6a9
--- /dev/null
+++ b/jobs/_shared/gruntfile.js
@@ -0,0 +1 @@
+../../tools/Gruntfile.js
\ No newline at end of file
diff --git a/jobs/_shared/gruntfile.js b/tools/Gruntfile.js
similarity index 100%
rename from jobs/_shared/gruntfile.js
rename to tools/Gruntfile.js
--
To view, visit https://gerrit.wikimedia.org/r/125430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I04d8e308daedb3ccb80d18b9a7ae96eb776bbbdf
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
