From e69370eb440840d305a3ba30cc37bfd501e80f29 Mon Sep 17 00:00:00 2001
From: ludamad <domuradical@gmail.com>
Date: Mon, 13 May 2024 18:19:39 +0000
Subject: [PATCH] hotfix runner checks

---
 .github/spot-runner-action/dist/index.js | 2 +-
 .github/spot-runner-action/src/main.ts   | 2 +-
 .github/workflows/ci.yml                 | 2 ++
 .github/workflows/setup-runner.yml       | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/spot-runner-action/dist/index.js b/.github/spot-runner-action/dist/index.js
index 91cca191ec46..3404bc2f3824 100644
--- a/.github/spot-runner-action/dist/index.js
+++ b/.github/spot-runner-action/dist/index.js
@@ -695,7 +695,7 @@ function pollSpotStatus(config, ec2Client, ghClient) {
             }
             try {
                 core.info("Found ec2 instance, looking for runners.");
-                if (yield ghClient.hasRunner([config.githubJobId])) {
+                if (process.env.WAIT_FOR_RUNNERS === "false" || (yield ghClient.hasRunner([config.githubJobId]))) {
                     // we have runners
                     return instances[0].InstanceId;
                 }
diff --git a/.github/spot-runner-action/src/main.ts b/.github/spot-runner-action/src/main.ts
index 5444cdd90cf9..b5db5bb376c5 100644
--- a/.github/spot-runner-action/src/main.ts
+++ b/.github/spot-runner-action/src/main.ts
@@ -23,7 +23,7 @@ async function pollSpotStatus(
     }
     try {
       core.info("Found ec2 instance, looking for runners.");
-      if (await ghClient.hasRunner([config.githubJobId])) {
+      if (process.env.WAIT_FOR_RUNNERS === "false" || await ghClient.hasRunner([config.githubJobId])) {
         // we have runners
         return instances[0].InstanceId!;
       }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index da6b429e9786..57c0e4301108 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,8 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   BUILD_INSTANCE_SSH_KEY: ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
+  # kludge until we move away from runners
+  WAIT_FOR_RUNNERS: false
 
 jobs:
   setup:
diff --git a/.github/workflows/setup-runner.yml b/.github/workflows/setup-runner.yml
index dbcec20563d3..5b773aea85dd 100644
--- a/.github/workflows/setup-runner.yml
+++ b/.github/workflows/setup-runner.yml
@@ -38,6 +38,8 @@ env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   BUILD_INSTANCE_SSH_KEY: ${{ secrets.BUILD_INSTANCE_SSH_KEY }}
+  # kludge until we move away from runners
+  WAIT_FOR_RUNNERS: true
 
 jobs:
   start-builder: