C. Scott Ananian has uploaded a new change for review.
https://gerrit.wikimedia.org/r/313913
Change subject: Merge branch 'master' into wmf-deploy
......................................................................
Merge branch 'master' into wmf-deploy
Change-Id: Ibc86a4ca0bb8e01cdaaf39ce9078214c7de99c85
---
M Makefile
1 file changed, 1 insertion(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/ocg-collection
refs/changes/13/313913/1
diff --git a/Makefile b/Makefile
index 113bd4d..a56d6ee 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,12 @@
-<<<<<<< HEAD (e3e0fd Merge branch 'master' into wmf-deploy)
-all: production
-=======
NODE?=/usr/bin/env nodejs
-all: debug
->>>>>>> BRANCH (02e565 Synchronize package.json unification code with
wmf-deploy br)
+all: production
core:
export LINK=g++
rm -f ./package.json
npm install core-js@0.9.x prfun@2.1.x semver@4.1.x
-<<<<<<< HEAD (e3e0fd Merge branch 'master' into wmf-deploy)
- ./unify-package-json.js
-=======
$(NODE) ./unify-package-json.js
->>>>>>> BRANCH (02e565 Synchronize package.json unification code with
wmf-deploy br)
npm install
npm update
npm dedupe
--
To view, visit https://gerrit.wikimedia.org/r/313913
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc86a4ca0bb8e01cdaaf39ce9078214c7de99c85
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/ocg-collection
Gerrit-Branch: wmf-deploy
Gerrit-Owner: C. Scott Ananian <canan...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
