Merge branch 'master' into zpedro/boxes_codespaces

AztecProtocol · Apr 20, 2024 · be53881 · be53881
2 parents 8528913 + 564b893
commit be53881
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.devcontainer/scripts/onCreateCommand.sh b/.devcontainer/scripts/onCreateCommand.sh
@@ -3,6 +3,7 @@
 TYPE=$1
 NAME=$2
 
+
 curl -s install.aztec.network | NON_INTERACTIVE=1 BIN_PATH=/usr/local/bin bash -s
 docker compose -f $HOME/.aztec/docker-compose.yml pull
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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:
@@ -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

diff --git a/.github/workflows/setup-runner.yml b/.github/workflows/setup-runner.yml
@@ -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 }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
     TYPE=$1
     NAME=$2
     curl -s install.aztec.network | NON_INTERACTIVE=1 BIN_PATH=/usr/local/bin bash -s
     docker compose -f $HOME/.aztec/docker-compose.yml pull
@@ Expand Down @@