Merge branch 'master' into comment-publish-report

iterative · May 29, 2022 · afe8be5 · afe8be5
2 parents 36b6c6b + 95019fb
commit afe8be5
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 70 deletions.
diff --git a/.github/workflows/test-deploy.yml b/.github/workflows/test-deploy.yml
@@ -36,7 +36,9 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: 3.9
-      - run: pip install tensorboard
+      - run: |
+          pip install tensorboard
+          pip install -I protobuf==3.20.1
       - run: npm ci
       - run: npm run test
         env:

diff --git a/README.md b/README.md
@@ -68,8 +68,7 @@ requirement.
 ### Bitbucket
 
 Please see our docs on
-[CML with Bitbucket Cloud](https://github.com/iterative/cml/wiki/CML-with-Bitbucket-Cloud).
-_Bitbucket Server support estimated to arrive by mid 2021._
+[CML with Bitbucket Cloud](https://cml.dev/doc/usage?tab=Bitbucket).
 
 ### GitHub
 

diff --git a/bin/cml/runner.js b/bin/cml/runner.js
@@ -37,8 +37,8 @@ const shutdown = async (opts) => {
 
     try {
       winston.info(`Unregistering runner ${name}...`);
-      RUNNER && RUNNER.kill('SIGINT');
       await cml.unregisterRunner({ name });
+      RUNNER && RUNNER.kill('SIGINT');
       winston.info('\tSuccess');
     } catch (err) {
       winston.error(`\tFailed: ${err.message}`);
@@ -69,6 +69,9 @@ const shutdown = async (opts) => {
   const destroyTerraform = async () => {
     if (!tfResource) return;
 
+    winston.info(`Waiting ${destroyDelay} seconds to destroy`);
+    await sleep(destroyDelay);
+
     try {
       winston.debug(await tf.destroy({ dir: tfPath }));
     } catch (err) {
@@ -82,9 +85,6 @@ const shutdown = async (opts) => {
     winston.info('runner status', { reason, status: 'terminated' });
   }
 
-  winston.info(`waiting ${destroyDelay} seconds before exiting...`);
-  await sleep(destroyDelay);
-
   if (!cloud) {
     try {
       await unregisterRunner();
@@ -125,47 +125,42 @@ const runCloud = async (opts) => {
       cloudStartupScript: startupScript,
       cloudAwsSecurityGroup: awsSecurityGroup,
       cloudAwsSubnet: awsSubnet,
-      tfFile,
       workdir
     } = opts;
 
+    if (gpu === 'tesla')
+      winston.warn(
+        'GPU model "tesla" has been deprecated; please use "v100" instead.'
+      );
+
     const tfPath = workdir;
     const tfMainPath = join(tfPath, 'main.tf');
 
-    let tpl;
-    if (tfFile) {
-      tpl = await fs.writeFile(tfMainPath, await fs.readFile(tfFile));
-    } else {
-      if (gpu === 'tesla')
-        winston.warn(
-          'GPU model "tesla" has been deprecated; please use "v100" instead.'
-        );
-      tpl = tf.iterativeCmlRunnerTpl({
-        tpiVersion,
-        repo,
-        token,
-        driver,
-        labels,
-        cmlVersion,
-        idleTimeout,
-        name,
-        single,
-        cloud,
-        region,
-        type,
-        permissionSet,
-        metadata,
-        gpu: gpu === 'tesla' ? 'v100' : gpu,
-        hddSize,
-        sshPrivate,
-        spot,
-        spotPrice,
-        startupScript,
-        awsSecurityGroup,
-        awsSubnet,
-        dockerVolumes
-      });
-    }
+    const tpl = tf.iterativeCmlRunnerTpl({
+      tpiVersion,
+      repo,
+      token,
+      driver,
+      labels,
+      cmlVersion,
+      idleTimeout,
+      name,
+      single,
+      cloud,
+      region,
+      type,
+      permissionSet,
+      metadata,
+      gpu: gpu === 'tesla' ? 'v100' : gpu,
+      hddSize,
+      sshPrivate,
+      spot,
+      spotPrice,
+      startupScript,
+      awsSecurityGroup,
+      awsSubnet,
+      dockerVolumes
+    });
 
     await fs.writeFile(tfMainPath, tpl);
     await tf.init({ dir: tfPath });
@@ -432,7 +427,6 @@ exports.handler = async (opts) => {
     await run(opts);
   } catch (error) {
     await shutdown({ ...opts, error });
-    throw error;
   }
 };
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
     "colors": "1.4.0"
   },
   "dependencies": {
-    "@actions/core": "^1.6.0",
+    "@actions/core": "^1.8.2",
     "@actions/github": "^4.0.0",
     "@npcz/magic": "^1.3.12",
     "@octokit/core": "^3.5.1",
@@ -80,7 +80,7 @@
     "fs-extra": "^9.1.0",
     "git-url-parse": "^11.6.0",
     "globby": "^11.0.4",
-    "https-proxy-agent": "^5.0.0",
+    "https-proxy-agent": "^5.0.1",
     "js-base64": "^3.7.2",
     "kebabcase-keys": "^1.0.0",
     "mdast": "^3.0.0",
@@ -93,7 +93,7 @@
     "remark-inline-links": "^6.0.1",
     "remark-reference-links": "^6.0.1",
     "semver": "^7.3.5",
-    "simple-git": "^3.5.0",
+    "simple-git": "^3.7.1",
     "strip-ansi": "^6.0.1",
     "strip-url-auth": "^1.0.1",
     "tar": "^6.1.11",

diff --git a/src/cml.js b/src/cml.js
@@ -379,7 +379,9 @@ class CML {
   }
 
   async unregisterRunner(opts = {}) {
-    const { id: runnerId } = await this.runnerByName(opts);
+    const { id: runnerId } = (await this.runnerByName(opts)) || {};
+    if (!runnerId) throw new Error(`Runner not found`);
+
     return await getDriver(this).unregisterRunner({ runnerId, ...opts });
   }