fix

AztecProtocol · May 12, 2024 · 084b1f0 · 084b1f0
1 parent 20e46e2
commit 084b1f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.github/ensure-builder/action.yml b/.github/ensure-builder/action.yml
@@ -28,7 +28,7 @@ runs:
           echo "instance_type=r6in.32xlarge r6a.32xlarge i4i.32xlarge r7iz.32xlarge" >> $GITHUB_OUTPUT
           echo "ami_id=ami-04d8422a9ba4de80f" >> $GITHUB_OUTPUT
           echo "ebs_cache_size=256" >> $GITHUB_OUTPUT
-          echo "runner_concurrency=50" >> $GITHUB_OUTPUT
+          echo "runner_concurrency=20" >> $GITHUB_OUTPUT
           echo "runner_label=$USERNAME-x86" >> $GITHUB_OUTPUT
           echo "ttl=40" >> $GITHUB_OUTPUT
         elif [[ $TYPE == builder-arm ]]; then

diff --git a/.github/spot-runner-action/dist/index.js b/.github/spot-runner-action/dist/index.js
@@ -962,9 +962,7 @@ function setupGithubRunners(ip, config) {
             `  ln -s $(pwd)/../externals ../${runnerNameBase}-$i`,
             `  pushd ../${runnerNameBase}-$i`,
             `  echo \${TOKENS[i]} > .runner-token`,
-            `  ./config.sh --unattended--url https://github.com/${github.context.repo.owner}/${github.context.repo.repo} --token \${TOKENS[i]} --labels ${config.githubActionRunnerLabel} --replace --name ${runnerNameBase}-$i`,
-            `  screen -dm ./run.sh`,
-            `  popd`,
+            `  screen -dm ./config.sh --unattended-url https://github.com/${github.context.repo.owner}/${github.context.repo.repo} --token \${TOKENS[i]} --labels ${config.githubActionRunnerLabel} --replace --name ${runnerNameBase}-$i &&  ./run.sh`,
             "done"
         ];
         const tempKeyPath = installSshKey(config.ec2Key);

diff --git a/.github/spot-runner-action/src/main.ts b/.github/spot-runner-action/src/main.ts
@@ -316,9 +316,7 @@ async function setupGithubRunners(ip: string, config: ActionConfig) {
     `  ln -s $(pwd)/../externals ../${runnerNameBase}-$i`,
     `  pushd ../${runnerNameBase}-$i`,
     `  echo \${TOKENS[i]} > .runner-token`,
-    `  ./config.sh --unattended--url https://github.com/${github.context.repo.owner}/${github.context.repo.repo} --token \${TOKENS[i]} --labels ${config.githubActionRunnerLabel} --replace --name ${runnerNameBase}-$i`,
-    `  screen -dm ./run.sh`,
-    `  popd`,
+    `  screen -dm ./config.sh --unattended-url https://github.com/${github.context.repo.owner}/${github.context.repo.repo} --token \${TOKENS[i]} --labels ${config.githubActionRunnerLabel} --replace --name ${runnerNameBase}-$i &&  ./run.sh`,
     "done"
   ];
   const tempKeyPath = installSshKey(config.ec2Key);