Replace request with fetch in ci-cleanup

Author: ljowen

buildprocess/ci-cleanup.js

@@ -1,18 +1,5 @@
 const childProcess = require("child_process");
 const fs = require("fs");
-const request = require("request");
-
-function requestPromise(options) {
-  return new Promise((resolve, reject) => {
-    request(options, (error, response, body) => {
-      if (error) {
-        reject(error);
-      } else {
-        resolve(response);
-      }
-    });
-  });
-}
 
 function getAllBranches(repo) {
   const baseUrl = "https://api.github.com/repos/" + repo + "/branches";
@@ -24,24 +11,24 @@ function getAllBranches(repo) {
     ++page;
 
     let url = baseUrl + "?page=" + page;
-    return requestPromise({
-      url: url,
+    return fetch(url, {
       headers: {
         "User-Agent": "TerriaJS CI",
         Authorization: `Bearer ${process.env.GITHUB_TOKEN}`
       }
-    }).then((pageResponse) => {
-      const pageOfBranches = JSON.parse(pageResponse.body);
-      result.push(
-        ...pageOfBranches.filter(
-          (branch) => branch.name.indexOf("greenkeeper/") !== 0
-        )
-      );
+    })
+      .then((response) => response.json())
+      .then((pageOfBranches) => {
+        result.push(
+          ...pageOfBranches.filter(
+            (branch) => branch.name.indexOf("greenkeeper/") !== 0
+          )
+        );
 
-      if (pageOfBranches.length > 0) {
-        return getNextPage();
-      }
-    });
+        if (pageOfBranches.length > 0) {
+          return getNextPage();
+        }
+      });
   }
 
   return getNextPage().then(() => result);

buildprocess/ci-deploy.sh

@@ -19,7 +19,6 @@ gh api /repos/${GITHUB_REPOSITORY}/statuses/${GITHUB_SHA} -f state=pending -f co
 # Install some tools we need from npm
 npm install -g https://github.com/terriajs/sync-dependencies
 npm install -g yarn@^1.19.0
-yarn add -W [email protected]
 
 # Clone and build TerriaMap, using this version of TerriaJS
 TERRIAJS_COMMIT_HASH=$(git rev-parse HEAD)