GH runner auto update (#679)

Co-authored-by: Casper da Costa-Luis <[email protected]>
iterative · Jul 28, 2021 · 7cbc820 · 7cbc820
1 parent 83d44c9
commit 7cbc820
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 16 deletions.
diff --git a/bin/cml-runner.js b/bin/cml-runner.js
@@ -41,7 +41,7 @@ const shutdown = async (opts) => {
   RUNNER_SHUTTING_DOWN = true;
 
   const { error, cloud } = opts;
-  const { name, workdir = '', tfResource, noRetry } = opts;
+  const { name, workdir = '', tfResource, noRetry, reason } = opts;
   const tfPath = workdir;
 
   const unregisterRunner = async () => {
@@ -95,10 +95,14 @@ const shutdown = async (opts) => {
     }
   };
 
+  if (error) console.log(error);
   console.log(
-    JSON.stringify({ level: error ? 'error' : 'info', status: 'terminated' })
+    JSON.stringify({
+      level: error ? 'error' : 'info',
+      status: 'terminated',
+      reason
+    })
   );
-  if (error) console.error(error);
   await sleep(RUNNER_DESTROY_DELAY);
 
   if (cloud) {
@@ -273,14 +277,18 @@ const runLocal = async (opts) => {
 
   proc.stderr.on('data', dataHandler);
   proc.stdout.on('data', dataHandler);
-  proc.on('uncaughtException', () => shutdown(opts));
-  proc.on('disconnect', () => shutdown(opts));
-  proc.on('exit', () => shutdown(opts));
+  proc.on('uncaughtException', () =>
+    shutdown({ ...opts, reason: 'proc_uncaughtException' })
+  );
+  proc.on('disconnect', () => shutdown({ ...opts, reason: 'proc_disconnect' }));
+  proc.on('exit', () => shutdown({ ...opts, reason: 'proc_exit' }));
 
   if (!noRetry) {
     try {
       console.log(`EC2 id ${await SpotNotifier.instanceId()}`);
-      SpotNotifier.on('termination', () => shutdown(opts));
+      SpotNotifier.on('termination', () =>
+        shutdown({ ...opts, reason: 'spot_termination' })
+      );
       SpotNotifier.start();
     } catch (err) {
       console.log('SpotNotifier can not be started.');
@@ -290,7 +298,7 @@ const runLocal = async (opts) => {
   if (parseInt(idleTimeout) !== 0) {
     const watcher = setInterval(() => {
       RUNNER_TIMEOUT_TIMER > idleTimeout &&
-        shutdown(opts) &&
+        shutdown({ ...opts, reason: `timeout:${idleTimeout}` }) &&
         clearInterval(watcher);
 
       if (!RUNNER_JOBS_RUNNING.length) RUNNER_TIMEOUT_TIMER++;
@@ -304,7 +312,8 @@ const runLocal = async (opts) => {
           new Date().getTime() - new Date(job.date).getTime() >
           GH_5_MIN_TIMEOUT
         )
-          shutdown(opts) && clearInterval(watcher);
+          shutdown({ ...opts, reason: 'timeout:72h' }) &&
+            clearInterval(watcher);
       });
     }, 60 * 1000);
   }
@@ -313,9 +322,9 @@ const runLocal = async (opts) => {
 };
 
 const run = async (opts) => {
-  process.on('SIGTERM', () => shutdown(opts));
-  process.on('SIGINT', () => shutdown(opts));
-  process.on('SIGQUIT', () => shutdown(opts));
+  process.on('SIGTERM', () => shutdown({ ...opts, reason: 'SIGTERM' }));
+  process.on('SIGINT', () => shutdown({ ...opts, reason: 'SIGINT' }));
+  process.on('SIGQUIT', () => shutdown({ ...opts, reason: 'SIGQUIT' }));
 
   opts.workdir = RUNNER_PATH;
   const {

diff --git a/src/cml.js b/src/cml.js
@@ -178,7 +178,9 @@ class CML {
         } else if (data.includes('Listening for Jobs')) {
           log.status = 'ready';
         }
-        return log;
+
+        const [, message] = data.split(/[A-Z]:\s/);
+        return { ...log, message: (message || data).replace(/\n/g, '') };
       }
 
       if (this.driver === GITLAB) {

diff --git a/src/drivers/github.js b/src/drivers/github.js
@@ -2,6 +2,7 @@ const url = require('url');
 const { spawn } = require('child_process');
 const { resolve } = require('path');
 const fs = require('fs').promises;
+const fetch = require('node-fetch');
 
 const github = require('@actions/github');
 const { Octokit } = require('@octokit/rest');
@@ -207,9 +208,15 @@ class Github {
         await fs.unlink(runnerCfg);
       } catch (e) {
         const arch = process.platform === 'darwin' ? 'osx-x64' : 'linux-x64';
-        const ver = '2.278.0';
+        const { tag_name: ver } = await (
+          await fetch(
+            'https://api.github.com/repos/actions/runner/releases/latest'
+          )
+        ).json();
         const destination = resolve(workdir, 'actions-runner.tar.gz');
-        const url = `https://github.com/actions/runner/releases/download/v${ver}/actions-runner-${arch}-${ver}.tar.gz`;
+        const url = `https://github.com/actions/runner/releases/download/${ver}/actions-runner-${arch}-${ver.substring(
+          1
+        )}.tar.gz`;
         await download({ url, path: destination });
         await tar.extract({ file: destination, cwd: workdir });
         await exec(`chmod -R 777 ${workdir}`);
@@ -219,7 +226,7 @@ class Github {
         `${resolve(
           workdir,
           'config.sh'
-        )} --token "${await this.runnerToken()}" --url "${
+        )} --unattended  --token "${await this.runnerToken()}" --url "${
           this.repo
         }"  --name "${name}" --labels "${labels}" --work "${resolve(
           workdir,