Skip to content

Commit

Permalink
build(core): remove jobs from pr and add to merge group. (#1260)
Browse files Browse the repository at this point in the history
**Motivation**
There are jobs that are quite unrelated to the files that have been
changed, but still could cause an issue in an edge case. Let's run these
tests on the merge queue instead of CI.

The main idea is that a job should be either in pull request or in merge
group. Jobs on pull requests should be the jobs that test code that was
changed and merge queues tests code that is probably unrelated but we
want a sanity check before merging

**Description**
- Moved several heavy tests from CI (on pull request) to merge group
- Various formatting and consistency changes.
- Removed "ci skipped" hack since we already include those jobs in the
merge queue
  • Loading branch information
mpaulucci authored Nov 26, 2024
1 parent 91b09a2 commit 1de31b5
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 78 deletions.
17 changes: 9 additions & 8 deletions .github/workflows/asertoor.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down Expand Up @@ -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"
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
10 changes: 3 additions & 7 deletions .github/workflows/ci_l2.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/ci_levm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
34 changes: 0 additions & 34 deletions .github/workflows/ci_skipped.yaml

This file was deleted.

51 changes: 29 additions & 22 deletions .github/workflows/docker_build.yaml
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions .github/workflows/hive.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
name: "Hive"
name: Hive
on:
merge_group:
pull_request:
branches: ["**"]
paths-ignore:
- 'README.md'
- 'LICENSE'
- "**/README.md"
- "**/docs/**"
- "crates/vm/levm/**"
- "crates/l2/**"

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/l2_contracts.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: L2 Contracts CI
on:
push:
branches: ["main"]
merge_group:
paths:
- "crates/l2/contracts/**"
pull_request:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/l2_prover_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ on:
merge_group:
pull_request:
branches: ["**"]
paths:
- "crates/l2/prover/**"

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint_pr_title.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "Lint PR title"
name: Lint PR title

on:
merge_group:
Expand Down

0 comments on commit 1de31b5

Please sign in to comment.