diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index e86cf963..014b2271 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -44,6 +44,8 @@ jobs: prepare-targets: name: Prepare targets strings runs-on: ubuntu-22.04 + if: | + always() && !cancelled() outputs: evm-targets: ${{ steps.get-targets.outputs.evm-targets }} prover-targets: ${{ steps.get-targets.outputs.prover-targets }} @@ -65,6 +67,9 @@ jobs: name: Get zkLLVM run to use artifacts from needs: - handle-syncwith + if: | + always() && !cancelled() && + (needs.handle-syncwith.result == 'success' || needs.handle-syncwith.result == 'skipped') runs-on: ubuntu-22.04 outputs: run-id: ${{ steps.get-run-id.outputs.run-id }} @@ -127,10 +132,16 @@ jobs: build-and-generate-proofs: name: Build prover, generate proofs for circuits runs-on: ubuntu-22.04 + container: ubuntu:jammy-20240111 needs: - handle-syncwith - get-zkllvm-run - prepare-targets + if: | + always() && !cancelled() && + (needs.handle-syncwith.result == 'success' || needs.handle-syncwith.result == 'skipped') && + (needs.get-zkllvm-run.result == 'success' || needs.get-zkllvm-run.result == 'skipped') && + (needs.prepare-targets.result == 'success' || needs.prepare-targets.result == 'skipped') strategy: matrix: cpp-compiler: [ g++, clang++ ] @@ -140,6 +151,12 @@ jobs: artifact-name: ${{ steps.artifact-name.outputs.merged }} steps: + - name: Install git CLI + # Checkout action inside container needs git tool + run: | + apt-get update + apt-get install git -y + - name: Checkout proof-producer uses: actions/checkout@v4 with: @@ -149,13 +166,6 @@ jobs: - name: Install dependencies uses: ./.github/actions/composite-install-dependecies - - name: Install fixes to GH worker - run: | - # https://github.com/actions/runner-images/issues/8659#issuecomment-1853177960 - sudo apt-get install --allow-downgrades \ - libstdc++6=12.3.0-1ubuntu1~22.04 \ - libgcc-s1=12.3.0-1ubuntu1~22.04 - - name: Print toolchain information run: | git --version @@ -291,6 +301,11 @@ jobs: - handle-syncwith - build-and-generate-proofs - prepare-targets + if: | + always() && !cancelled() && + (needs.handle-syncwith.result == 'success' || needs.handle-syncwith.result == 'skipped') && + (needs.build-and-generate-proofs.result == 'success' || needs.build-and-generate-proofs.result == 'skipped') && + (needs.prepare-targets.result == 'success' || needs.prepare-targets.result == 'skipped') uses: NilFoundation/evm-placeholder-verification/.github/workflows/reusable-verify-proofs.yml@5bb7c4b0790f56b3a339e33ba442816fac17ab88 with: artifact-name: ${{ needs.build-and-generate-proofs.outputs.artifact-name }}