Skip to content

Commit

Permalink
fix: various infra things
Browse files Browse the repository at this point in the history
fix: easier local desting removing push

fix: build

fix: add to build manifest
  • Loading branch information
Maddiaa0 committed Nov 27, 2024
1 parent 36373a8 commit 7f58a02
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-aztec-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ jobs:
dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
- name: Build & push aztec blob sink image x86-64
run: |
earthly-ci --no-output --push ./yarn-project+export-blob-sink --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=x86_64
earthly-ci --no-output --push ./yarn-project+export-blob-sink-arch --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=x86_64
build-blob-sink-arm:
needs: [configure, build-aztec-arm]
Expand All @@ -220,7 +220,7 @@ jobs:
dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}"
- name: Build & push aztec blob sink image arm
run: |
earthly-ci --no-output --push ./yarn-project+export-blob-sink --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=arm64
earthly-ci --no-output --push ./yarn-project+export-blob-sink-arch --DIST_TAG=${{ env.GIT_COMMIT }} --ARCH=arm64
publish-manifests:
Expand Down
7 changes: 7 additions & 0 deletions build_manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,13 @@ cli-wallet:
- yarn-project
multiarch: buildx

blob-sink:
buildDir: yarn-project
projectDir: yarn-project/blob-sink
dependencies:
- yarn-project
multiarch: buildx

# Builds all the boxes. They are then independently tested in the container.
boxes:
buildDir: boxes
Expand Down
6 changes: 5 additions & 1 deletion yarn-project/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,12 @@ blob-sink:
export-blob-sink:
FROM +blob-sink
ARG DIST_TAG="latest"
SAVE IMAGE aztecprotocol/blob-sink:${DIST_TAG}

export-blob-sink-arch:
FROM +blob-sink
ARG ARCH
SAVE IMAGE --push aztecprotocol/blob-sink:${DIST_TAG}${ARCH:+-$ARCH}
SAVE IMAGE --push aztecprotocol/blob-sink:${ARCH:+-$ARCH}

aztec-prod:
FROM +cli-base
Expand Down
8 changes: 3 additions & 5 deletions yarn-project/end-to-end/src/fixtures/snapshot_manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -420,11 +420,9 @@ async function setupFromState(statePath: string, logger: Logger): Promise<Subsys

// TODO(md): will this revive state???
const blobSink = await createBlobSinkService({
port: blobSinkPort,
dataStoreConfig: {
dataDirectory: statePath,
dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
},
port: 5052,
dataDirectory: statePath,
dataStoreMapSizeKB: aztecNodeConfig.dataStoreMapSizeKB,
});
await blobSink.start();

Expand Down
6 changes: 5 additions & 1 deletion yarn-project/end-to-end/src/fixtures/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,11 @@ export async function setup(

// Blob sink service - blobs get posted here and served from here
const blobSinkPort = await getPort();
const blobSink = await createBlobSinkService({ port: blobSinkPort });
const blobSink = await createBlobSinkService({
port: blobSinkPort,
dataDirectory: undefined,
dataStoreMapSizeKB: 1, // will be unused, set as default
});
config.blobSinkUrl = `http://127.0.0.1:${blobSinkPort}`;

const deployL1ContractsValues =
Expand Down

0 comments on commit 7f58a02

Please sign in to comment.