Skip to content

N
nebula
Commit 07d950c6 authored by Mark Tyneway's avatar Mark Tyneway
Browse files
Options

ci: fix merge conflicts

parent e39a70f0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
.circleci/config.yml
View file @ 07d950c6
...@@ -459,10 +459,9 @@ jobs: ...@@ -459,10 +459,9 @@ jobs:
contracts-bedrock-validate-spaces: contracts-bedrock-validate-spaces:
docker: docker:
- image: <<pipeline.parameters.ci_builder_image>> - image: <<pipeline.parameters.ci_builder_image>>
resource_class: xlarge resource_class: medium
steps: steps:
- checkout - checkout
- attach_workspace: { at: "." }
- restore_cache: - restore_cache:
name: Restore PNPM Package Cache name: Restore PNPM Package Cache
keys: keys:
...@@ -532,7 +531,7 @@ jobs: ...@@ -532,7 +531,7 @@ jobs:
contracts-ts-tests: contracts-ts-tests:
docker: docker:
- image: <<pipeline.parameters.ci_builder_image>> - image: <<pipeline.parameters.ci_builder_image>>
resource_class: large resource_class: medium
steps: steps:
- checkout - checkout
- attach_workspace: { at: "." } - attach_workspace: { at: "." }
...@@ -554,7 +553,7 @@ jobs: ...@@ -554,7 +553,7 @@ jobs:
sdk-next-tests: sdk-next-tests:
docker: docker:
- image: <<pipeline.parameters.ci_builder_image>> - image: <<pipeline.parameters.ci_builder_image>>
resource_class: large resource_class: medium
steps: steps:
- checkout - checkout
- attach_workspace: { at: "." } - attach_workspace: { at: "." }
......
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