diff --git a/.github/workflows/ci_l1.yaml b/.github/workflows/ci_l1.yaml index 5a34351fd..8c02bec4d 100644 --- a/.github/workflows/ci_l1.yaml +++ b/.github/workflows/ci_l1.yaml @@ -101,36 +101,21 @@ jobs: name: ethrex_image path: /tmp/ethrex_image.tar - run-assertoor-tx-check: - name: Assertoor - Transaction Check + run-assertoor: + name: Assertoor - ${{ matrix.name }} runs-on: ubuntu-latest needs: [docker_build] - steps: - - uses: actions/checkout@v4 - - - name: Download artifacts - uses: actions/download-artifact@v4 - with: - name: ethrex_image - path: /tmp - - - name: Load image - run: | - docker load --input /tmp/ethrex_image.tar - - - name: Run assertoor - uses: ethpandaops/kurtosis-assertoor-github-action@v1 - with: - enclave_name: "ethrex-assertoor-tx" - kurtosis_version: "1.4.2" - ethereum_package_url: "github.com/lambdaclass/ethereum-package" - ethereum_package_branch: "ethrex-integration" - ethereum_package_args: "./.github/config/assertoor/network_params_tx.yaml" + if: ${{ github.event_name != 'merge_group' }} + strategy: + matrix: + include: + - name: Transaction Check + enclave_name: "ethrex-assertoor-tx" + ethereum_package_args: "./.github/config/assertoor/network_params_tx.yaml" + - name: Blobs & Stability Check + enclave_name: "ethrex-assertoor-blob" + ethereum_package_args: "./.github/config/assertoor/network_params_blob.yaml" - run-assertoor-blob-check: - name: Assertoor - Blobs & Stability Check - runs-on: ubuntu-latest - needs: [docker_build] steps: - uses: actions/checkout@v4 @@ -147,11 +132,11 @@ jobs: - name: Run assertoor uses: ethpandaops/kurtosis-assertoor-github-action@v1 with: - enclave_name: "ethrex-assertoor-blob" + enclave_name: ${{ matrix.enclave_name }} kurtosis_version: "1.4.2" ethereum_package_url: "github.com/lambdaclass/ethereum-package" ethereum_package_branch: "ethrex-integration" - ethereum_package_args: "./.github/config/assertoor/network_params_blob.yaml" + ethereum_package_args: ${{ matrix.ethereum_package_args }} run-hive: name: Hive - ${{ matrix.name }} @@ -212,22 +197,17 @@ jobs: # "Integration Test" is a required check, don't change the name name: Integration Test runs-on: ubuntu-latest - needs: [run-assertoor-tx-check, run-assertoor-blob-check, run-hive] + needs: [run-assertoor, run-hive] # Make sure this job runs even if the previous jobs failed or were skipped if: ${{ always() && needs.run-assertoor.result != 'skipped' && needs.run-hive.result != 'skipped' }} steps: - name: Check if any job failed run: | - if [ "${{ needs.run-assertoor-tx-check.result }}" != "success" ]; then + if [ "${{ needs.run-assertoor.result }}" != "success" ]; then echo "Job Assertoor Tx Check failed" exit 1 fi - if [ "${{ needs.run-assertoor-blob-check.result }}" != "success" ]; then - echo "Job Assertoor Blob Check failed" - exit 1 - fi - if [ "${{ needs.run-hive.result }}" != "success" ]; then echo "Job Hive failed" exit 1