Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

ci: remove PR rebasing from patch branch #943

Merged
merged 1 commit into from
Apr 8, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,12 @@ commands:
root: *workspace_location
paths:
- dist
# Command for checking out the source code from GitHub. This also ensures that the source code
# can be merged to the master branch without conflicts.
checkout_and_rebase:
description: Checkout and verify clean merge with master
steps:
- checkout
- build-tools/merge-with-parent:
parent: master

jobs:
lint:
<<: *job_defaults
steps:
- checkout_and_rebase
- checkout
- restore_cache:
key: *cache_key
- *yarn_install
Expand All @@ -79,7 +71,7 @@ jobs:
# https://circleci.com/docs/2.0/configuration-reference/#resource_class
resource_class: large
steps:
- checkout_and_rebase
- checkout
- restore_cache:
key: *cache_key
- *yarn_install
Expand All @@ -90,7 +82,7 @@ jobs:
test:
<<: *job_defaults
steps:
- checkout_and_rebase
- checkout
- restore_cache:
key: *cache_key
- *yarn_install
Expand All @@ -101,7 +93,7 @@ jobs:
steps:
- attach_workspace:
at: *workspace_location
- checkout_and_rebase
- checkout
- restore_cache:
key: *cache_key
- *yarn_install
Expand All @@ -112,7 +104,7 @@ jobs:
steps:
- attach_workspace:
at: *workspace_location
- checkout_and_rebase
- checkout
- restore_cache:
key: *cache_key
- *yarn_install
Expand Down