Skip to content

Commit 42fc412

Browse files
authored
ci: remove PR rebasing from patch branch (angular#943)
1 parent 27a3f02 commit 42fc412

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

.circleci/config.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,12 @@ commands:
5252
root: *workspace_location
5353
paths:
5454
- dist
55-
# Command for checking out the source code from GitHub. This also ensures that the source code
56-
# can be merged to the master branch without conflicts.
57-
checkout_and_rebase:
58-
description: Checkout and verify clean merge with master
59-
steps:
60-
- checkout
61-
- build-tools/merge-with-parent:
62-
parent: master
6355

6456
jobs:
6557
lint:
6658
<<: *job_defaults
6759
steps:
68-
- checkout_and_rebase
60+
- checkout
6961
- restore_cache:
7062
key: *cache_key
7163
- *yarn_install
@@ -79,7 +71,7 @@ jobs:
7971
# https://circleci.com/docs/2.0/configuration-reference/#resource_class
8072
resource_class: large
8173
steps:
82-
- checkout_and_rebase
74+
- checkout
8375
- restore_cache:
8476
key: *cache_key
8577
- *yarn_install
@@ -90,7 +82,7 @@ jobs:
9082
test:
9183
<<: *job_defaults
9284
steps:
93-
- checkout_and_rebase
85+
- checkout
9486
- restore_cache:
9587
key: *cache_key
9688
- *yarn_install
@@ -101,7 +93,7 @@ jobs:
10193
steps:
10294
- attach_workspace:
10395
at: *workspace_location
104-
- checkout_and_rebase
96+
- checkout
10597
- restore_cache:
10698
key: *cache_key
10799
- *yarn_install
@@ -112,7 +104,7 @@ jobs:
112104
steps:
113105
- attach_workspace:
114106
at: *workspace_location
115-
- checkout_and_rebase
107+
- checkout
116108
- restore_cache:
117109
key: *cache_key
118110
- *yarn_install

0 commit comments

Comments
 (0)