Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

marketplace-solver binary #1783

Merged
merged 12 commits into from
Jul 31, 2024
Merged

marketplace-solver binary #1783

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6c71417
solver binary
imabdulbasit Jul 22, 2024
5eb6cd4
solver dockerfile
imabdulbasit Jul 22, 2024
7c8e8a3
ci
imabdulbasit Jul 22, 2024
782d8ed
fix postgres warnings in docker demo
imabdulbasit Jul 22, 2024
05dab8f
fix comment
imabdulbasit Jul 22, 2024
dcfb918
update solvet to 0.1.1
imabdulbasit Jul 25, 2024
a95802a
Merge branch 'main' into ab/solver-bin
imabdulbasit Jul 26, 2024
5ba7bfb
lint
imabdulbasit Jul 26, 2024
d8091ae
add marketplace-solver to upload artifacts job
imabdulbasit Jul 26, 2024
87e466e
fix build ci
imabdulbasit Jul 26, 2024
54c1fdb
Merge remote-tracking branch 'origin/main' into ab/solver-bin
imabdulbasit Jul 30, 2024
c5b7918
Merge branch 'main' into ab/solver-bin
imabdulbasit Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test te
ESPRESSO_COMMITMENT_TASK_PORT=30010
ESPRESSO_SEQUENCER0_DB_PORT=5432
ESPRESSO_SEQUENCER1_DB_PORT=5433
MARKETPLACE_SOLVER_POSTGRES_PORT=5434
ESPRESSO_MARKETPLACE_SOLVER_API_PORT=25000
ESPRESSO_STATE_RELAY_SERVER_PORT=30011
ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:${ESPRESSO_STATE_RELAY_SERVER_PORT}
ESPRESSO_BLOCK_EXPLORER_PORT=3000
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ jobs:
target/release/espresso-dev-node
target/release/pub-key
target/release/espresso-bridge
target/release/marketplace-solver

build-arm:
runs-on: buildjet-4vcpu-ubuntu-2204-arm
Expand Down Expand Up @@ -131,6 +132,7 @@ jobs:
target/release/espresso-dev-node
target/release/pub-key
target/release/espresso-bridge
target/release/marketplace-solver

build-dockers:
runs-on: ubuntu-latest
Expand All @@ -150,6 +152,7 @@ jobs:
nasty-client-tag: ${{ steps.nasty-client.outputs.tags }}
espresso-dev-node-tag: ${{ steps.espresso-dev-node.outputs.tags }}
bridge-tag: ${{ steps.bridge.outputs.tags }}
marketplace-solver-tag: ${{ steps.marketplace-solver.outputs.tags }}
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand Down Expand Up @@ -263,6 +266,12 @@ jobs:
with:
images: ghcr.io/espressosystems/espresso-sequencer/bridge

- name: Generate marketplace-solver metadata
uses: docker/metadata-action@v5
id: marketplace-solver
with:
images: ghcr.io/espressosystems/espresso-sequencer/marketplace-solver

- name: Build and push sequencer docker
uses: docker/build-push-action@v6
with:
Expand Down Expand Up @@ -402,6 +411,16 @@ jobs:
tags: ${{ steps.bridge.outputs.tags }}
labels: ${{ steps.bridge.outputs.labels }}

- name: Build and push marketplace-solver docker
uses: docker/build-push-action@v6
with:
context: ./
file: ./docker/espresso-marketplace-solver.Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.-marketplace-solver.outputs.tags }}
labels: ${{ steps.-marketplace-solver.outputs.labels }}

test-demo:
if: ${{ github.event_name != 'pull_request' }}
runs-on: ubuntu-latest
Expand Down Expand Up @@ -430,6 +449,8 @@ jobs:
docker pull ${{ needs.build-dockers.outputs.builder-tag }}
docker pull ${{ needs.build-dockers.outputs.nasty-client-tag }}
docker pull ${{ needs.build-dockers.outputs.bridge-tag }}
docker pull ${{ needs.build-dockers.outputs.marketplace-solver-tag }}

- name: Tag new docker images
run: |
docker tag ${{ needs.build-dockers.outputs.sequencer-tag }} ghcr.io/espressosystems/espresso-sequencer/sequencer:main
Expand All @@ -445,6 +466,7 @@ jobs:
docker tag ${{ needs.build-dockers.outputs.builder-tag }} ghcr.io/espressosystems/espresso-sequencer/builder:main
docker tag ${{ needs.build-dockers.outputs.nasty-client-tag }} ghcr.io/espressosystems/espresso-sequencer/nasty-client:main
docker tag ${{ needs.build-dockers.outputs.bridge-tag }} ghcr.io/espressosystems/espresso-sequencer/bridge:main
docker tag ${{ needs.build-dockers.outputs.marketplace-solver-tag }} ghcr.io/espressosystems/espresso-sequencer/marketplace-solver:main

- name: Test docker demo
run: |
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/build_static.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ jobs:
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/pub-key
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/espresso-bridge
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/espresso-dev-node
${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/marketplace-solver

static-dockers:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -208,6 +209,13 @@ jobs:
images: ghcr.io/espressosystems/espresso-sequencer/bridge
flavor: suffix=musl

- name: Generate marketplace-solver metadata
uses: docker/metadata-action@v5
id: marketplace-solver
with:
images: ghcr.io/espressosystems/espresso-sequencer/marketplace-solver
flavor: suffix=musl

- name: Build and push sequencer docker
uses: docker/build-push-action@v6
with:
Expand Down Expand Up @@ -327,3 +335,13 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.bridge.outputs.tags }}
labels: ${{ steps.bridge.outputs.labels }}

- name: Build and push marketplace-solver docker
uses: docker/build-push-action@v6
with:
context: ./
file: ./docker/marketplace-solver.Dockerfile
platforms: linux/amd64,linux/arm64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.marketplace-solver.outputs.tags }}
labels: ${{ steps.marketplace-solver.outputs.labels }}
Loading
Loading