Skip to content

Commit

Permalink
Merge branch 'master' into zpedro/boxes_codespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
signorecello authored Apr 20, 2024
2 parents 8528913 + 564b893 commit 6dee814
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:
run: earthly-ci --no-output +bench-ultra-honk --bench_mode=cache

merge-check:
runs-on: ${{ github.actor }}-x86
runs-on: ubuntu-latest
needs: [e2e, bb-native-tests, bb-bench]
if: always() # Ensures this job runs regardless of the success or failure of dependencies.
steps:
Expand All @@ -160,8 +160,8 @@ jobs:
echo "Pull request merging now allowed."
notify:
needs: [e2e, bb-native-tests, bb-bench]
runs-on: ubuntu-latest
needs: [e2e, bb-native-tests, bb-bench]
if: ${{ github.ref == 'refs/heads/master' && failure() }}
steps:
- name: Send notification to aztec3-ci channel if workflow failed on master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/setup-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
group: start-builder-${{ inputs.runner_label }}
steps:
- name: Start EC2 runner
uses: AztecProtocol/ec2-action-builder@v0.14e
uses: AztecProtocol/ec2-action-builder@v0.15
with:
github_token: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }}
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand Down

0 comments on commit 6dee814

Please sign in to comment.