diff --git a/.circleci/config.yml b/.circleci/config.yml index 54f19de4e9b1..6fd1da6335c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -947,30 +947,16 @@ jobs: mentions: "@proofs-team" cannon-stf-verify: - docker: - - image: <> + machine: true + resource_class: ethereum-optimism/latitude-1 steps: - checkout - - setup_remote_docker - - restore_cache: - name: Restore Go modules cache - key: gomod-{{ checksum "go.sum" }} - - restore_cache: - name: Restore Go build cache - keys: - - golang-build-cache-cannon-stf-verify-{{ checksum "go.sum" }} - - golang-build-cache-cannon-stf-verify- - run: name: Build cannon command: make cannon - run: name: Verify the Cannon STF command: make -C ./cannon cannon-stf-verify - - save_cache: - name: Save Go build cache - key: golang-build-cache-cannon-stf-verify-{{ checksum "go.sum" }} - paths: - - "/root/.cache/go-build" - notify-failures-on-develop: mentions: "@proofs-team" @@ -1018,38 +1004,6 @@ jobs: no_output_timeout: 20m - notify-failures-on-develop - go-mod-download: - docker: - - image: <> - parameters: - file: - default: go.sum - description: The file name of checksum for restore_cache and save_cache. - type: string - key: - default: gomod - description: The key of restore_cache and save_cache. - type: string - steps: - - checkout - - restore_cache: - key: << parameters.key >>-{{ checksum "<< parameters.file >>" }} - name: Restore Go modules cache - - run: - name: Sanity check go mod cache path - command: test "$(go env GOMODCACHE)" == "/go/pkg/mod" # yes, it's an odd path - - run: - command: go mod download - name: Download Go module dependencies - - run: - name: "Go mod tidy" - command: make mod-tidy && git diff --exit-code - - save_cache: - key: << parameters.key >>-{{ checksum "<< parameters.file >>" }} - name: Save Go modules cache - paths: - - "/go/pkg/mod" - bedrock-go-tests: # just a helper, that depends on all the actual test jobs docker: # Use a smaller base image to avoid pulling the huge ci-builder @@ -1237,7 +1191,6 @@ workflows: - not: equal: [scheduled_pipeline, << pipeline.trigger_source >>] jobs: - - go-mod-download - contracts-bedrock-build: name: contracts-bedrock-build # Build with just core + script contracts. @@ -1321,14 +1274,12 @@ workflows: - op-program-compat - bedrock-go-tests: requires: - - go-mod-download - go-lint - cannon-build-test-vectors - cannon-go-lint-and-test-32-bit - cannon-go-lint-and-test-64-bit - check-generated-mocks-op-node - check-generated-mocks-op-service - - go-mod-download - op-program-compat # Not needed for the devnet but we want to make sure they build successfully - cannon-docker-build @@ -1530,11 +1481,8 @@ workflows: - not: equal: [scheduled_pipeline, << pipeline.trigger_source >>] jobs: - - go-mod-download - cannon-prestate - cannon-stf-verify: - requires: - - go-mod-download context: - slack - contracts-bedrock-build: