diff --git a/.github/workflows/asertoor.yaml b/.github/workflows/asertoor.yaml index f08a1609fe..0c249535e4 100644 --- a/.github/workflows/asertoor.yaml +++ b/.github/workflows/asertoor.yaml @@ -1,13 +1,14 @@ -name: "Assertoor" +name: Assertoor on: - merge_group: pull_request: branches: ["**"] paths-ignore: - - 'README.md' - - 'LICENSE' + - "README.md" + - "LICENSE" - "**/README.md" - "**/docs/**" + - "crates/vm/levm/**" + - "crates/l2/**" concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -40,7 +41,7 @@ jobs: - name: Setup kurtosis testnet and run assertoor tests uses: ethpandaops/kurtosis-assertoor-github-action@v1 with: - kurtosis_version: '1.3.1' - ethereum_package_url: 'github.com/lambdaclass/ethereum-package' - ethereum_package_branch: 'ethrex-integration' - ethereum_package_args: './test_data/network_params.yaml' + kurtosis_version: "1.3.1" + ethereum_package_url: "github.com/lambdaclass/ethereum-package" + ethereum_package_branch: "ethrex-integration" + ethereum_package_args: "./test_data/network_params.yaml" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 25650c1d2b..f13f4f224c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ on: - "LICENSE" - "**/README.md" - "**/docs/**" - - "crates/vm/levm/**" # We ran this in a separate workflow + - "crates/vm/levm/**" # We run this in a separate workflow concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/ci_l2.yaml b/.github/workflows/ci_l2.yaml index 1f97bafc0a..cf64874d6e 100644 --- a/.github/workflows/ci_l2.yaml +++ b/.github/workflows/ci_l2.yaml @@ -1,14 +1,10 @@ -name: CI L2 +name: CI (L2) on: merge_group: pull_request: branches: ["**"] - paths-ignore: - - "README.md" - - "LICENSE" - - "**/README.md" - - "**/docs/**" - - "crates/vm/levm/**" # We ran this in a separate workflow + paths: + - "crates/l2/**" concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/ci_levm.yaml b/.github/workflows/ci_levm.yaml index ff8d5734e6..e7ac06aa70 100644 --- a/.github/workflows/ci_levm.yaml +++ b/.github/workflows/ci_levm.yaml @@ -2,10 +2,12 @@ name: CI LEVM on: merge_group: + paths: + - "crates/vm/levm/**" pull_request: + branches: ["**"] paths: - "crates/vm/levm/**" - branches: ["*"] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/ci_skipped.yaml b/.github/workflows/ci_skipped.yaml deleted file mode 100644 index 5488778a95..0000000000 --- a/.github/workflows/ci_skipped.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: CI Skipped -on: - pull_request: - branches: ["**"] - paths: - - 'README.md' - - 'LICENSE' - - "**/README.md" - - "**/docs/**" - - "crates/vm/levm/**" -jobs: - lint: - name: Lint - runs-on: ubuntu-latest - if: false - steps: [run: true] - - test: - name: Test - runs-on: ubuntu-latest - if: false - steps: [run: true] - - docker_build: - name: Build Docker image - runs-on: ubuntu-latest - if: false - steps: [run: true] - - prover: - name: Build RISC-V zkVM program - runs-on: ubuntu-latest - if: false - steps: [run: true] diff --git a/.github/workflows/docker_build.yaml b/.github/workflows/docker_build.yaml index 4b59ed342b..d5d858c593 100644 --- a/.github/workflows/docker_build.yaml +++ b/.github/workflows/docker_build.yaml @@ -1,30 +1,37 @@ name: Docker build on: - workflow_call: + workflow_call: + merge_group: + pull_request: + branches: ["**"] + paths-ignore: + - "README.md" + - "LICENSE" + - "**/README.md" + - "**/docs/**" jobs: - docker_build: - name: Docker Build image - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 + docker_build: + name: Docker Build image + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + - 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: ethrex - outputs: type=docker,dest=/tmp/ethrex_image.tar - - - name: Upload artifacts - uses: actions/upload-artifact@v4 - with: - name: ethrex_image - path: /tmp/ethrex_image.tar + - name: Build Docker image + uses: docker/build-push-action@v5 + with: + context: . + file: ./Dockerfile + load: true + tags: ethrex + outputs: type=docker,dest=/tmp/ethrex_image.tar + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: ethrex_image + path: /tmp/ethrex_image.tar diff --git a/.github/workflows/hive.yaml b/.github/workflows/hive.yaml index 9ef3a66fef..e1774a7606 100644 --- a/.github/workflows/hive.yaml +++ b/.github/workflows/hive.yaml @@ -1,6 +1,5 @@ -name: "Hive" +name: Hive on: - merge_group: pull_request: branches: ["**"] paths-ignore: @@ -8,6 +7,8 @@ on: - 'LICENSE' - "**/README.md" - "**/docs/**" + - "crates/vm/levm/**" + - "crates/l2/**" concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/l2_contracts.yaml b/.github/workflows/l2_contracts.yaml index 6ddd773531..f51b51558a 100644 --- a/.github/workflows/l2_contracts.yaml +++ b/.github/workflows/l2_contracts.yaml @@ -1,7 +1,6 @@ name: L2 Contracts CI on: - push: - branches: ["main"] + merge_group: paths: - "crates/l2/contracts/**" pull_request: diff --git a/.github/workflows/l2_prover_ci.yaml b/.github/workflows/l2_prover_ci.yaml index f5d27b0e67..8db8dc50a7 100644 --- a/.github/workflows/l2_prover_ci.yaml +++ b/.github/workflows/l2_prover_ci.yaml @@ -3,6 +3,8 @@ on: merge_group: pull_request: branches: ["**"] + paths: + - "crates/l2/prover/**" concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} diff --git a/.github/workflows/lint_pr_title.yml b/.github/workflows/lint_pr_title.yml index 5c428338fb..258d11400c 100644 --- a/.github/workflows/lint_pr_title.yml +++ b/.github/workflows/lint_pr_title.yml @@ -1,4 +1,4 @@ -name: "Lint PR title" +name: Lint PR title on: merge_group: