chore(ci): fix on-demand starting (#6434)

Saw this when we requested too many spots. Should up that limit, but meanwhile the fallback to on-demand should work
AztecProtocol · May 15, 2024 · c3efb9c · c3efb9c
1 parent 80674d9
commit c3efb9c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/spot-runner-action/dist/index.js b/.github/spot-runner-action/dist/index.js
@@ -315,10 +315,11 @@ class Ec2Instance {
                     SubnetId: this.config.githubActionRunnerConcurrency > 0 ? this.config.ec2SubnetId : undefined,
                 })),
             };
+            const clientToken = this.config.clientToken ? this.config.clientToken + ",spot=" + useOnDemand : undefined;
             const createFleetRequest = {
                 Type: "instant",
                 LaunchTemplateConfigs: [fleetLaunchConfig],
-                ClientToken: this.config.clientToken || undefined,
+                ClientToken: clientToken,
                 SpotOptions: {
                     AllocationStrategy: "capacity-optimized",
                 },

diff --git a/.github/spot-runner-action/src/ec2.ts b/.github/spot-runner-action/src/ec2.ts
@@ -234,10 +234,11 @@ export class Ec2Instance {
         SubnetId: this.config.githubActionRunnerConcurrency > 0 ? this.config.ec2SubnetId : undefined,
       })),
     };
+    const clientToken = this.config.clientToken ?this.config.clientToken + ",spot=" + useOnDemand : undefined;
     const createFleetRequest: CreateFleetRequest = {
       Type: "instant",
       LaunchTemplateConfigs: [fleetLaunchConfig],
-      ClientToken: this.config.clientToken || undefined,
+      ClientToken: clientToken,
       SpotOptions: {
         AllocationStrategy: "capacity-optimized",
       },