Skip to content

Commit 073d510

Browse files
committed
[CI] CirlceCI: Use modularized docker containers
1 parent 8fd5346 commit 073d510

File tree

1 file changed

+31
-28
lines changed

1 file changed

+31
-28
lines changed

.circleci/config.yml

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
unittests-linux-generic:
44
docker:
5-
- image: modm/modm-build:latest
5+
- image: modm/modm-build:cortex-m
66
steps:
77
- checkout
88
- run:
@@ -20,8 +20,6 @@ jobs:
2020
scons --version
2121
which g++
2222
g++ --version
23-
which avr-g++
24-
avr-g++ --version
2523
which arm-none-eabi-g++
2624
arm-none-eabi-g++ --version
2725
which lbuild
@@ -36,13 +34,6 @@ jobs:
3634
(cd test && make compile-nucleo-f411)
3735
(cd test && make compile-nucleo-f103)
3836
(cd test && make compile-nucleo-l432)
39-
- run:
40-
name: Compile AVR Unittests
41-
command: |
42-
(cd test && make compile-al-avreb-can)
43-
(cd test && make compile-arduino-uno)
44-
(cd test && make compile-arduino-nano)
45-
(cd test && make compile-mega-2560-pro)
4637
- run:
4738
name: Linux Examples
4839
command: |
@@ -75,7 +66,7 @@ jobs:
7566
7667
stm32-examples:
7768
docker:
78-
- image: modm/modm-build:latest
69+
- image: modm/modm-build:cortex-m
7970
steps:
8071
- checkout
8172
- run:
@@ -117,7 +108,7 @@ jobs:
117108
118109
stm32f4-examples:
119110
docker:
120-
- image: modm/modm-build:latest
111+
- image: modm/modm-build:cortex-m
121112
steps:
122113
- checkout
123114
- run:
@@ -132,21 +123,33 @@ jobs:
132123
133124
avr-examples:
134125
docker:
135-
- image: modm/modm-build:latest
126+
- image: modm/modm-build:avr
136127
steps:
137128
- checkout
138129
- run:
139130
name: Checkout code and update modm tools
140131
command: |
141132
(git submodule sync && git submodule update --init --jobs 8) & pip3 install --upgrade --upgrade-strategy=eager modm & wait
133+
- run:
134+
name: Check environment
135+
command: |
136+
which avr-g++
137+
avr-g++ --version
142138
- run:
143139
name: Examples AVR Series
144140
command: |
145141
(cd examples && ../tools/scripts/examples_compile.py avr arduino_uno)
142+
- run:
143+
name: Compile AVR Unittests
144+
command: |
145+
(cd test && make compile-al-avreb-can)
146+
(cd test && make compile-arduino-uno)
147+
(cd test && make compile-arduino-nano)
148+
(cd test && make compile-mega-2560-pro)
146149
147150
avr-compile-all:
148151
docker:
149-
- image: modm/modm-build:latest
152+
- image: modm/modm-build:avr
150153
steps:
151154
- checkout
152155
- run:
@@ -163,7 +166,7 @@ jobs:
163166

164167
samd-compile-all:
165168
docker:
166-
- image: modm/modm-build:latest
169+
- image: modm/modm-build:cortex-m
167170
steps:
168171
- checkout
169172
- run:
@@ -180,7 +183,7 @@ jobs:
180183

181184
stm32f0-compile-all:
182185
docker:
183-
- image: modm/modm-build:latest
186+
- image: modm/modm-build:cortex-m
184187
steps:
185188
- checkout
186189
- run:
@@ -197,7 +200,7 @@ jobs:
197200

198201
stm32f1-compile-all:
199202
docker:
200-
- image: modm/modm-build:latest
203+
- image: modm/modm-build:cortex-m
201204
steps:
202205
- checkout
203206
- run:
@@ -214,7 +217,7 @@ jobs:
214217

215218
stm32f2-compile-all:
216219
docker:
217-
- image: modm/modm-build:latest
220+
- image: modm/modm-build:cortex-m
218221
steps:
219222
- checkout
220223
- run:
@@ -231,7 +234,7 @@ jobs:
231234

232235
stm32f3-compile-all:
233236
docker:
234-
- image: modm/modm-build:latest
237+
- image: modm/modm-build:cortex-m
235238
steps:
236239
- checkout
237240
- run:
@@ -248,7 +251,7 @@ jobs:
248251

249252
stm32f4-compile-all:
250253
docker:
251-
- image: modm/modm-build:latest
254+
- image: modm/modm-build:cortex-m
252255
steps:
253256
- checkout
254257
- run:
@@ -265,7 +268,7 @@ jobs:
265268

266269
stm32f7-compile-all:
267270
docker:
268-
- image: modm/modm-build:latest
271+
- image: modm/modm-build:cortex-m
269272
steps:
270273
- checkout
271274
- run:
@@ -282,7 +285,7 @@ jobs:
282285

283286
stm32l1-compile-all:
284287
docker:
285-
- image: modm/modm-build:latest
288+
- image: modm/modm-build:cortex-m
286289
steps:
287290
- checkout
288291
- run:
@@ -299,7 +302,7 @@ jobs:
299302

300303
stm32l4-compile-all:
301304
docker:
302-
- image: modm/modm-build:latest
305+
- image: modm/modm-build:cortex-m
303306
steps:
304307
- checkout
305308
- run:
@@ -316,7 +319,7 @@ jobs:
316319

317320
stm32g0-compile-all:
318321
docker:
319-
- image: modm/modm-build:latest
322+
- image: modm/modm-build:cortex-m
320323
steps:
321324
- checkout
322325
- run:
@@ -333,7 +336,7 @@ jobs:
333336

334337
stm32g4-compile-all:
335338
docker:
336-
- image: modm/modm-build:latest
339+
- image: modm/modm-build:cortex-m
337340
steps:
338341
- checkout
339342
- run:
@@ -350,7 +353,7 @@ jobs:
350353

351354
build-docs:
352355
docker:
353-
- image: modm/modm-build:latest
356+
- image: modm/modm-build:base
354357
steps:
355358
- checkout
356359
- run:
@@ -380,7 +383,7 @@ jobs:
380383

381384
build-upload-docs:
382385
docker:
383-
- image: modm/modm-build:latest
386+
- image: modm/modm-build:base
384387
steps:
385388
- add_ssh_keys:
386389
fingerprints:
@@ -409,7 +412,7 @@ jobs:
409412
410413
api-docs-all:
411414
docker:
412-
- image: modm/modm-build:latest
415+
- image: modm/modm-build:base
413416
steps:
414417
- checkout
415418
- run:

0 commit comments

Comments
 (0)