From 32a6d02abc268ef409cc8ceded8e9d069dcda071 Mon Sep 17 00:00:00 2001 From: ludamad Date: Tue, 16 Apr 2024 17:02:14 -0400 Subject: [PATCH 1/3] fix(ci): race condition when making multiple spot --- .github/workflows/setup-runner.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/setup-runner.yml b/.github/workflows/setup-runner.yml index 15b670c82ec0..ebe35f70f9b7 100644 --- a/.github/workflows/setup-runner.yml +++ b/.github/workflows/setup-runner.yml @@ -3,7 +3,7 @@ # just for the CI job. These are specced per user and run the entire CI. # TODO These have a persistent EBS volume that forms a fast-online docker image cache (used by Earthly), meaning # TODO build steps that ran in previous invocations are quickly ran from cache. -name: Reusable Spot Instance and Setup Workflow +name: Setup Runner and CI on: workflow_call: inputs: @@ -52,6 +52,9 @@ on: jobs: start-builder: runs-on: ubuntu-latest + # we want to avoid race conditions when making spot across multiple PRs as we only use one runner + concurrency: + group: start-builder-${{ inputs.runner_label }} steps: - name: Start EC2 runner uses: AztecProtocol/ec2-action-builder@v0.10 From 36aac44c0c148f25cbccbcc9750ba82f277f1f89 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 17 Apr 2024 09:05:58 -0400 Subject: [PATCH 2/3] Update setup-runner.yml --- .github/workflows/setup-runner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/setup-runner.yml b/.github/workflows/setup-runner.yml index ebe35f70f9b7..4d0e5bc00aec 100644 --- a/.github/workflows/setup-runner.yml +++ b/.github/workflows/setup-runner.yml @@ -57,7 +57,7 @@ jobs: group: start-builder-${{ inputs.runner_label }} steps: - name: Start EC2 runner - uses: AztecProtocol/ec2-action-builder@v0.10 + uses: AztecProtocol/ec2-action-builder@v0.11 with: github_token: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }} aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }} From 8328ec6e9ce757907cf486bc24c45fb43d88f22c Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 17 Apr 2024 09:11:24 -0400 Subject: [PATCH 3/3] Update setup-runner.yml --- .github/workflows/setup-runner.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/setup-runner.yml b/.github/workflows/setup-runner.yml index 4d0e5bc00aec..80a9ba497b1b 100644 --- a/.github/workflows/setup-runner.yml +++ b/.github/workflows/setup-runner.yml @@ -57,7 +57,7 @@ jobs: group: start-builder-${{ inputs.runner_label }} steps: - name: Start EC2 runner - uses: AztecProtocol/ec2-action-builder@v0.11 + uses: AztecProtocol/ec2-action-builder@v0.12 with: github_token: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }} aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}