Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into pw/data-store-metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
PhilWindle committed Nov 25, 2024
2 parents 15b7d8c + ece1d45 commit 4e9453b
Show file tree
Hide file tree
Showing 911 changed files with 109,784 additions and 68,073 deletions.
37,513 changes: 18,344 additions & 19,169 deletions .github/spot-runner-action/dist/index.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .github/spot-runner-action/src/ec2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ export class Ec2Instance {
Ebs: {
VolumeSize: 64,
VolumeType: 'gp3',
Throughput: 1000,
Iops: 5000
Throughput: 125,
Iops: 3000
},
},
],
Expand Down
15 changes: 8 additions & 7 deletions .github/spot-runner-action/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ async function pollSpotStatus(
}
try {
core.info("Found ec2 instance, looking for runners.");
if (process.env.WAIT_FOR_RUNNERS === "false" || await ghClient.hasRunner([config.githubJobId])) {
// TODO find out whatever happened here but we seem to not be able to wait for runners
//if (process.env.WAIT_FOR_RUNNERS === "false" || await ghClient.hasRunner([config.githubJobId])) {
// we have runners
return instances[0].InstanceId!;
}
//}
} catch (err) {}
// wait 10 seconds
await new Promise((r) => setTimeout(r, 10000));
Expand Down Expand Up @@ -174,11 +175,11 @@ async function startWithGithubRunners(config: ActionConfig) {
return false;
}
await setupGithubRunners(ip, config);
if (instanceId) await ghClient.pollForRunnerCreation([config.githubJobId]);
else {
core.error("Instance failed to register with Github Actions");
throw Error("Instance failed to register with Github Actions");
}
// if (instanceId) await ghClient.pollForRunnerCreation([config.githubJobId]);
// else {
// core.error("Instance failed to register with Github Actions");
// throw Error("Instance failed to register with Github Actions");
// }
core.info("Done setting up runner.")
}
// Export to github environment
Expand Down
22 changes: 13 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ jobs:
run: earthly-ci --no-output ./+test

noir-build-acir-tests:
needs: [build, configure]
needs: [build-images, configure]
runs-on: ${{ needs.configure.outputs.username }}-x86
if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
steps:
Expand All @@ -399,7 +399,7 @@ jobs:
run: earthly-ci --no-output ./noir/+build-acir-tests

bb-acir-tests-bb:
needs: [noir-build-acir-tests, configure]
needs: [noir-build-acir-tests, build, configure]
runs-on: ${{ needs.configure.outputs.username }}-x86
if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
steps:
Expand All @@ -414,7 +414,7 @@ jobs:
run: earthly-ci --no-output ./+barretenberg-acir-tests-bb

bb-acir-tests-bb-ultra-plonk:
needs: [noir-build-acir-tests, configure]
needs: [noir-build-acir-tests, build, configure]
runs-on: ${{ needs.configure.outputs.username }}-x86
if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
steps:
Expand All @@ -429,7 +429,7 @@ jobs:
run: earthly-ci --no-output ./+barretenberg-acir-tests-bb-ultra-plonk

bb-acir-tests-bb-ultra-honk:
needs: [noir-build-acir-tests, configure]
needs: [noir-build-acir-tests, build, configure]
runs-on: ${{ needs.configure.outputs.username }}-x86
if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
steps:
Expand All @@ -444,7 +444,7 @@ jobs:
run: earthly-ci --no-output ./+barretenberg-acir-tests-bb-ultra-honk

bb-acir-tests-bb-mega-honk:
needs: [noir-build-acir-tests, configure]
needs: [noir-build-acir-tests, build, configure]
runs-on: ${{ needs.configure.outputs.username }}-x86
if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
steps:
Expand All @@ -459,7 +459,7 @@ jobs:
run: earthly-ci --no-output ./+barretenberg-acir-tests-bb-mega-honk

bb-acir-tests-sol:
needs: [noir-build-acir-tests, configure]
needs: [noir-build-acir-tests, build, configure]
runs-on: ${{ needs.configure.outputs.username }}-x86
if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
steps:
Expand All @@ -474,7 +474,7 @@ jobs:
run: earthly-ci --no-output ./+barretenberg-acir-tests-sol

bb-acir-tests-sol-honk:
needs: [noir-build-acir-tests, configure]
needs: [noir-build-acir-tests, build, configure]
runs-on: ${{ needs.configure.outputs.username }}-x86
if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
steps:
Expand All @@ -489,7 +489,7 @@ jobs:
run: earthly-ci --no-output ./+barretenberg-acir-tests-sol-honk

bb-acir-tests-bb-js:
needs: [noir-build-acir-tests, configure]
needs: [noir-build-acir-tests, build, configure]
runs-on: ${{ needs.configure.outputs.username }}-x86
if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
steps:
Expand Down Expand Up @@ -715,6 +715,10 @@ jobs:
values: 16-validators
runner_type: 16core-tester-x86
timeout: 60
- test: gating-passive.test.ts
values: 16-validators
runner_type: 16core-tester-x86
timeout: 60
steps:
- uses: actions/checkout@v4
with: { ref: "${{ env.GIT_COMMIT }}" }
Expand Down Expand Up @@ -752,7 +756,7 @@ jobs:
path: network-test.log

l1-contracts-test:
needs: [build, configure]
needs: [build-images, configure]
runs-on: ${{ needs.configure.outputs.username }}-x86
if: needs.configure.outputs.l1-contracts == 'true'
steps:
Expand Down
17 changes: 15 additions & 2 deletions .github/workflows/publish-aztec-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,19 @@ jobs:
with:
concurrency_key: publish-npm
dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"

- name: Publish bb.js NPM package
run: |
DEPLOY_TAG=${{ env.DEPLOY_TAG }}
VERSION=${DEPLOY_TAG#aztec-packages-v}
earthly-ci \
--no-output \
--secret NPM_TOKEN=${{ env.NPM_TOKEN }} \
./barretenberg/ts+publish-npm \
--DIST_TAG=latest \
--VERSION=$VERSION \
--DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }}
- name: Publish yarn-project NPM packages
run: |
DEPLOY_TAG=${{ env.DEPLOY_TAG }}
Expand All @@ -287,14 +300,14 @@ jobs:
--VERSION=$VERSION \
--DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }}
- name: Publish bb.js NPM package
- name: Publish l1-contracts NPM package
run: |
DEPLOY_TAG=${{ env.DEPLOY_TAG }}
VERSION=${DEPLOY_TAG#aztec-packages-v}
earthly-ci \
--no-output \
--secret NPM_TOKEN=${{ env.NPM_TOKEN }} \
./barretenberg/ts+publish-npm \
./l1-contracts+publish-npm \
--DIST_TAG=latest \
--VERSION=$VERSION \
--DRY_RUN=${{ (github.event.inputs.publish == 'false') && '1' || '0' }}
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ terraform.tfstate*
.secret
.bb_tmp

# Terraform
*.tfvars

# tmux
tmux-client-*.log
Expand Down
2 changes: 1 addition & 1 deletion .noir-sync-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
13856a121125b1ccca15919942081a5d157d280e
68c32b4ffd9b069fe4b119327dbf4018c17ab9d4
8 changes: 4 additions & 4 deletions .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
".": "0.62.0",
".": "0.63.1",
"yarn-project/cli": "0.35.1",
"yarn-project/aztec": "0.62.0",
"barretenberg": "0.62.0",
"barretenberg/ts": "0.62.0"
"yarn-project/aztec": "0.63.1",
"barretenberg": "0.63.1",
"barretenberg/ts": "0.63.1"
}
Loading

0 comments on commit 4e9453b

Please sign in to comment.