File tree Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Expand file tree Collapse file tree 3 files changed +5
-6
lines changed Original file line number Diff line number Diff line change @@ -484,7 +484,7 @@ jobs:
484
484
steps :
485
485
- uses : actions/checkout@v4
486
486
with : { fetch-depth: 2 }
487
- - run : echo # nothing specific to install or do
487
+ - run : sudo pip install yq
488
488
- run : cd test/cube && make
489
489
490
490
zephyr_examples :
Original file line number Diff line number Diff line change @@ -337,7 +337,7 @@ jobs:
337
337
- run : |
338
338
if ./test/match_changed_files.sh '^src|examples/stm32/nucleo-*-cube-*'; then
339
339
echo GO=1 >> $GITHUB_ENV
340
- # nothing specific to install or do
340
+ sudo pip install yq
341
341
fi
342
342
- if : ${{ env.GO == 1 }}
343
343
run : cd test/cube && make
Original file line number Diff line number Diff line change @@ -2,15 +2,14 @@ ROOT ?= $(realpath $(CURDIR)/../..)
2
2
PROJECTS ?= $(wildcard ../../examples/stm32/nucleo-* -cube-* )
3
3
TARGET ?= Debug
4
4
DOCKER = docker run --rm -v $(ROOT ) :$(ROOT ) -v $(CURDIR ) :/root -w $(CURDIR )
5
- IMAGE ?= springrockconsulting/stm32cubeide:v1
6
- # image author did not set path, so a hardcoded reference to a variable name dir is needed
7
- PATHTO ?= /opt/st/stm32cubeide_1.12.0/
5
+ IMAGE ?= scaprile/cubeozone
6
+ # set PATHTO if image author did not set path
8
7
9
8
all : $(PROJECTS )
10
9
$(DOCKER ) $(IMAGE ) $(PATHTO ) headless-build.sh -data workspace -removeAll workspace
11
10
12
11
$(PROJECTS ) : FORCE
13
- $(DOCKER ) $(IMAGE ) $(PATHTO ) headless-build.sh -data workspace -import $@ -cleanBuild $(@F ) /$(TARGET )
12
+ (make -C $@ && sudo make -C $@ clean) || $(DOCKER ) $(IMAGE ) $(PATHTO ) headless-build.sh -data workspace -import $@ -cleanBuild $(@F ) /$(TARGET )
14
13
15
14
FORCE :
16
15
You can’t perform that action at this time.
0 commit comments