Commit 86a74bcc authored by smartcontracts's avatar smartcontracts Committed by GitHub

ci: simplify contract build job inputs (#11965)

Simplifies the inputs to contracts-bedrock-build so that it
takes a single skip_pattern command instead of allowing the user
to specify any build command.
parent c186b488
...@@ -207,9 +207,10 @@ jobs: ...@@ -207,9 +207,10 @@ jobs:
- image: <<pipeline.parameters.ci_builder_image>> - image: <<pipeline.parameters.ci_builder_image>>
resource_class: xlarge resource_class: xlarge
parameters: parameters:
build_command: skip_pattern:
description: Glob pattern of tests to skip
type: string type: string
default: just build default: ""
steps: steps:
- checkout - checkout
- install-contracts-dependencies - install-contracts-dependencies
...@@ -232,7 +233,7 @@ jobs: ...@@ -232,7 +233,7 @@ jobs:
working_directory: packages/contracts-bedrock working_directory: packages/contracts-bedrock
- run: - run:
name: Build contracts name: Build contracts
command: << parameters.build_command >> command: forge build --deny-warnings --skip <<parameters.skip_pattern>>
environment: environment:
FOUNDRY_PROFILE: ci FOUNDRY_PROFILE: ci
working_directory: packages/contracts-bedrock working_directory: packages/contracts-bedrock
...@@ -1615,7 +1616,7 @@ workflows: ...@@ -1615,7 +1616,7 @@ workflows:
- go-mod-download - go-mod-download
- contracts-bedrock-build: - contracts-bedrock-build:
# Build with just core + script contracts. # Build with just core + script contracts.
build_command: forge build --skip test --deny-warnings skip_pattern: test
- contracts-bedrock-tests: - contracts-bedrock-tests:
# Test everything except PreimageOracle.t.sol since it's slow. # Test everything except PreimageOracle.t.sol since it's slow.
name: contracts-bedrock-tests name: contracts-bedrock-tests
...@@ -2138,7 +2139,7 @@ workflows: ...@@ -2138,7 +2139,7 @@ workflows:
requires: requires:
- go-mod-download - go-mod-download
- contracts-bedrock-build: - contracts-bedrock-build:
build_command: forge build --skip test skip_pattern: test
context: context:
- slack - slack
- go-e2e-test: - go-e2e-test:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment