Bug 1443093 - Change the update.sh scripts to use in-tree tooltool.py and update the node_modules bundles on the servers. r=mossop
authorMark Banner <standard8@mozilla.com>
Mon, 19 Mar 2018 10:18:49 +0000
changeset 769711 d1bb57364f356b9550538ac286575fb3d742753f
parent 769710 64c5f14f196bb4e24c87601886b8fdcbb446fd4b
child 769712 d6382ca4c8ae7e683fb352d2fc6324a82ef189bb
push id103206
push userbmo:bdahl@mozilla.com
push dateMon, 19 Mar 2018 23:33:04 +0000
reviewersmossop
bugs1443093
milestone61.0a1
Bug 1443093 - Change the update.sh scripts to use in-tree tooltool.py and update the node_modules bundles on the servers. r=mossop MozReview-Commit-ID: HQLRoOYVjXo
tools/lint/eslint/eslint-plugin-mozilla/manifest.tt
tools/lint/eslint/eslint-plugin-mozilla/update.sh
tools/lint/eslint/manifest.tt
tools/lint/eslint/update.sh
--- a/tools/lint/eslint/eslint-plugin-mozilla/manifest.tt
+++ b/tools/lint/eslint/eslint-plugin-mozilla/manifest.tt
@@ -1,10 +1,10 @@
 [
   {
     "algorithm": "sha512",
     "visibility": "public",
     "filename": "eslint-plugin-mozilla.tar.gz",
     "unpack": true,
-    "digest": "9e77c57391b71ebd9243123319b1d2e875adde6e5c85387271b1952e6545a7279f7c24f53c80f123dddedd554da2aba658a4e0568fb5454496b4fbe92e1fbf33",
-    "size": 3173498
+    "digest": "0a2fcb783b8761b2054f25e6621849d55427fc3349e22c346ce56d4969928e72368ac7fe58536d7801f89d60146fa9a58493c20f9cf376b2563fd32cc7b701c4",
+    "size": 3221147
   }
 ]
--- a/tools/lint/eslint/eslint-plugin-mozilla/update.sh
+++ b/tools/lint/eslint/eslint-plugin-mozilla/update.sh
@@ -42,25 +42,20 @@ rm -rf node_modules
 rm package-lock.json
 
 echo "Installing modules for eslint-plugin-mozilla..."
 npm install
 
 echo "Creating eslint-plugin-mozilla.tar.gz..."
 tar cvz -f eslint-plugin-mozilla.tar.gz node_modules
 
-echo "Downloading tooltool..."
-wget https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py
-chmod +x tooltool.py
-
 echo "Adding eslint-plugin-mozilla.tar.gz to tooltool..."
 rm -f manifest.tt
-./tooltool.py add --visibility public --unpack eslint-plugin-mozilla.tar.gz
+../../../../python/mozbuild/mozbuild/action/tooltool.py add --visibility public --unpack eslint-plugin-mozilla.tar.gz --url="https://api.pub.build.mozilla.org/tooltool/"
 
 echo "Uploading eslint-plugin-mozilla.tar.gz to tooltool..."
-./tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint/eslint-plugin-mozilla"
+../../../../python/mozbuild/mozbuild/action/tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint/eslint-plugin-mozilla" --url="https://api.pub.build.mozilla.org/tooltool/"
 
 echo "Cleaning up..."
 rm eslint-plugin-mozilla.tar.gz
-rm tooltool.py
 
 echo ""
 echo "Update complete, please commit and check in your changes."
--- a/tools/lint/eslint/manifest.tt
+++ b/tools/lint/eslint/manifest.tt
@@ -1,10 +1,10 @@
 [
   {
     "algorithm": "sha512",
     "visibility": "public",
     "filename": "eslint.tar.gz",
     "unpack": true,
-    "digest": "0c4825c9a0873f55d6a74417e8ef9c1189e0430b2a90eff799f312ed95f4effee0e4f61da081022fb0f2b8ef6946f5c8b9a519e5d05dac8ed90c9126088c2f47",
-    "size": 4582274
+    "digest": "75cf4d907c146fbbc3010fe322e06742090726ef9c4337fc870231b281afa88b50d807f37fd09b341ea2dbcc3b77f5d6b37924f4efa3264c7a55cda95d31a3bb",
+    "size": 2964047
   }
 ]
--- a/tools/lint/eslint/update.sh
+++ b/tools/lint/eslint/update.sh
@@ -52,28 +52,23 @@ echo "Installing eslint and external plu
 npm install
 
 echo "Creating npm shrinkwrap..."
 mv package-lock.json npm-shrinkwrap.json
 
 echo "Creating eslint.tar.gz..."
 tar cvz --exclude=eslint-plugin-mozilla --exclude=eslint-plugin-spidermonkey-js -f eslint.tar.gz node_modules
 
-echo "Downloading tooltool..."
-wget https://raw.githubusercontent.com/mozilla/build-tooltool/master/tooltool.py
-chmod +x tooltool.py
-
 echo "Adding eslint.tar.gz to tooltool..."
 rm tools/lint/eslint/manifest.tt
-./tooltool.py add --visibility public --unpack eslint.tar.gz
+./python/mozbuild/mozbuild/action/tooltool.py add --visibility public --unpack eslint.tar.gz --url="https://api.pub.build.mozilla.org/tooltool/"
 
 echo "Uploading eslint.tar.gz to tooltool..."
-./tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint"
+./python/mozbuild/mozbuild/action/tooltool.py upload --authentication-file=~/.tooltool-token --message "node_modules folder update for tools/lint/eslint" --url="https://api.pub.build.mozilla.org/tooltool/"
 
 echo "Cleaning up..."
 mv manifest.tt tools/lint/eslint/manifest.tt
 rm eslint.tar.gz
-rm tooltool.py
 
 cd $DIR
 
 echo ""
 echo "Update complete, please commit and check in your changes."