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.

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

chore(l1): reduce unnecessary docker builds and remove duplicate workflow executions in main #1032

Merged
merged 22 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
489253d
Inter workflow artifact download test
rodrigo-o Oct 31, 2024
a04c8a4
Renamed the workflow correctly
rodrigo-o Oct 31, 2024
cea1fc0
moving the docker image download to hive
rodrigo-o Oct 31, 2024
5eac784
Correctly format the download job
rodrigo-o Oct 31, 2024
bb41063
Make hive depend on docker image upload
rodrigo-o Oct 31, 2024
d846f08
Checking adding steps to the job pointing to the toher workflow
rodrigo-o Oct 31, 2024
264430c
Fixed a typo
rodrigo-o Oct 31, 2024
32addef
Test workflow_run as dependency
rodrigo-o Oct 31, 2024
943bc63
Removed all call to the other workflow from hive
rodrigo-o Oct 31, 2024
e2b5126
Moving to just depending on the docker build job
rodrigo-o Oct 31, 2024
6a4b5ef
Check readding branches and making the name shorter and without spaces
rodrigo-o Oct 31, 2024
851bb80
Testing removing also concurrency and just letting the on workflow_run
rodrigo-o Oct 31, 2024
f3cab3c
defaulted to share the docker image in the same job due to the workfl…
rodrigo-o Oct 31, 2024
9d9c0dd
Moved assertoor to the same workflow as hive to share the docker image
rodrigo-o Oct 31, 2024
731eb1e
Correctly add needs
rodrigo-o Oct 31, 2024
08d2749
Check that now the workflows run
rodrigo-o Oct 31, 2024
8d75341
Merge branch 'main' into reuse-docker-build-on-other-jobs
rodrigo-o Oct 31, 2024
0e1bc33
Added checkout to the assertoor job
rodrigo-o Oct 31, 2024
60e3fd1
Remove Docker build from the hive steps
rodrigo-o Oct 31, 2024
99974cd
Reverted CI changes
rodrigo-o Oct 31, 2024
ccb4104
Resolve the duplication upon merging in main related to push + merge_…
rodrigo-o Oct 31, 2024
84eb616
Fixed a typo
rodrigo-o Oct 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
41 changes: 41 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Docker Image
rodrigo-o marked this conversation as resolved.
Show resolved Hide resolved
on:
merge_group:
push:
branches: [main]
pull_request:
branches: ["**"]
paths-ignore:
- "README.md"
- "LICENSE"
- "**/README.md"
- "**/docs/**"

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

env:
RUST_VERSION: 1.80.1

jobs:
build-and-upload:
name: Build and Upload image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build Docker image
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
load: true
tags: ethereum_rust
outputs: type=docker,dest=/tmp/ethereum_rust_image.tar
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: ethereum_rust_image
path: /tmp/ethereum_rust_image.tar
14 changes: 0 additions & 14 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,6 @@ jobs:
run: |
rodrigo-o marked this conversation as resolved.
Show resolved Hide resolved
make test

docker-build:
name: Build Docker image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build Docker image
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
load: true # Important for building without pushing

prover:
name: Build RISC-V zkVM program
runs-on: ubuntu-latest
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/hive.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ on:
- 'LICENSE'
- "**/README.md"
- "**/docs/**"
workflow_run:
workflows: ["Docker Image"]
types:
- completed

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand All @@ -23,6 +27,7 @@ env:
jobs:
run-hive:
name: ${{ matrix.name }}
needs: [docker-build]
runs-on: ubuntu-latest
strategy:
matrix:
Expand All @@ -43,6 +48,16 @@ jobs:
name: "Cancun Engine tests"
run_command: make run-hive SIMULATION=ethereum/engine TEST_PATTERN="cancun/Unique Payload ID|ParentHash equals BlockHash on NewPayload|Re-Execute Payload|Payload Build after New Invalid Payload|RPC|Build Payload with Invalid ChainID|Invalid PayloadAttributes, Zero timestamp, Syncing=False|Invalid PayloadAttributes, Parent timestamp, Syncing=False|Invalid PayloadAttributes, Missing BeaconRoot, Syncing=False|Suggested Fee Recipient Test|PrevRandao Opcode Transactions Test|Invalid Missing Ancestor ReOrg, StateRoot"
steps:
- name: Download artifacts
uses: actions/download-artifact@v4
with:
run-id: ${{ github.event.workflow_run.id }}
name: ethereum_rust_image
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Load image
run: |
docker load --input /tmp/ethereum_rust_image.tar
docker image ls -a
- name: Checkout sources
uses: actions/checkout@v3

Expand Down
Loading