Skip to content

Commit 43b91ff

Browse files
authored
More CircleCI fixes (#668)
1 parent 91bf8c2 commit 43b91ff

File tree

1 file changed

+14
-29
lines changed

1 file changed

+14
-29
lines changed

.circleci/config.yml

Lines changed: 14 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ commands:
5454
command: |
5555
git submodule update --init opt/readies
5656
./opt/readies/bin/getpy3
57-
./opt/system-setup.py
5857
5958
setup-build-system:
6059
steps:
@@ -64,16 +63,20 @@ commands:
6463
command: |
6564
./opt/system-setup.py
6665
66+
checkout-all:
67+
steps:
68+
- checkout
69+
- run:
70+
name: Checkout submodules
71+
command: git submodule update --init --recursive
72+
6773
build-steps:
6874
parameters:
6975
platform:
7076
type: string
7177
steps:
7278
- abort_for_docs
73-
- checkout
74-
- run:
75-
name: Submodule checkout
76-
command: git submodule update --init --recursive
79+
- checkout-all
7780
- restore_cache:
7881
keys:
7982
- v1-dependencies-{{ checksum "get_deps.sh" }}
@@ -118,11 +121,8 @@ commands:
118121
platforms-build-steps:
119122
steps:
120123
- abort_for_docs
121-
- checkout
124+
- checkout-all
122125
- relocate-docker-storage
123-
- run:
124-
name: Submodule checkout
125-
command: git submodule update --init --recursive
126126
- setup-automation
127127
- run:
128128
name: Build for platform
@@ -176,10 +176,7 @@ jobs:
176176
docker:
177177
- image: redislabsmodules/llvm-toolset:latest
178178
steps:
179-
- checkout
180-
- run:
181-
name: Submodule checkout
182-
command: git submodule update --init --recursive
179+
- checkout-all
183180
- setup-build-system
184181
- run:
185182
name: lint
@@ -207,10 +204,7 @@ jobs:
207204
- image: redisfab/rmbuilder:6.2.1-x64-buster
208205
steps:
209206
- abort_for_docs
210-
- checkout
211-
- run:
212-
name: Submodule checkout
213-
command: git submodule update --init --recursive
207+
- checkout-all
214208
- restore_cache:
215209
keys:
216210
- build-dependencies-{{ checksum "get_deps.sh" }}
@@ -241,10 +235,7 @@ jobs:
241235
- image: redisfab/rmbuilder:6.2.1-x64-buster
242236
steps:
243237
- abort_for_docs
244-
- checkout
245-
- run:
246-
name: Submodule checkout
247-
command: git submodule update --init --recursive
238+
- checkout-all
248239
- restore_cache:
249240
keys:
250241
- build-dependencies-{{ checksum "get_deps.sh" }}
@@ -283,10 +274,7 @@ jobs:
283274
image: cimg/base:2020.01
284275
steps:
285276
- abort_for_docs
286-
- checkout
287-
- run:
288-
name: Submodule checkout
289-
command: git submodule update --init --recursive
277+
- checkout-all
290278
- run:
291279
name: Checkout LFS
292280
command: |
@@ -315,10 +303,7 @@ jobs:
315303
image: ubuntu-1604-cuda-11.1:202012-01
316304
steps:
317305
- abort_for_docs
318-
- checkout
319-
- run:
320-
name: Submodule checkout
321-
command: git submodule update --init --recursive
306+
- checkout-all
322307
- run:
323308
name: Relocate docker overlay2 dir
324309
command: |

0 commit comments

Comments
 (0)