File tree Expand file tree Collapse file tree 1 file changed +5
-13
lines changed Expand file tree Collapse file tree 1 file changed +5
-13
lines changed Original file line number Diff line number Diff line change @@ -52,20 +52,12 @@ commands:
52
52
root : *workspace_location
53
53
paths :
54
54
- 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
63
55
64
56
jobs :
65
57
lint :
66
58
<< : *job_defaults
67
59
steps :
68
- - checkout_and_rebase
60
+ - checkout
69
61
- restore_cache :
70
62
key : *cache_key
71
63
- *yarn_install
79
71
# https://circleci.com/docs/2.0/configuration-reference/#resource_class
80
72
resource_class : large
81
73
steps :
82
- - checkout_and_rebase
74
+ - checkout
83
75
- restore_cache :
84
76
key : *cache_key
85
77
- *yarn_install
90
82
test :
91
83
<< : *job_defaults
92
84
steps :
93
- - checkout_and_rebase
85
+ - checkout
94
86
- restore_cache :
95
87
key : *cache_key
96
88
- *yarn_install
101
93
steps :
102
94
- attach_workspace :
103
95
at : *workspace_location
104
- - checkout_and_rebase
96
+ - checkout
105
97
- restore_cache :
106
98
key : *cache_key
107
99
- *yarn_install
@@ -112,7 +104,7 @@ jobs:
112
104
steps :
113
105
- attach_workspace :
114
106
at : *workspace_location
115
- - checkout_and_rebase
107
+ - checkout
116
108
- restore_cache :
117
109
key : *cache_key
118
110
- *yarn_install
You can’t perform that action at this time.
0 commit comments