Skip to content

Commit 586e072

Browse files
authored
Merge pull request #2911 from cesanta/testcube
add Wizard examples
2 parents 399291d + 882dd1f commit 586e072

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ jobs:
484484
steps:
485485
- uses: actions/checkout@v4
486486
with: { fetch-depth: 2 }
487-
- run: echo # nothing specific to install or do
487+
- run: sudo pip install yq
488488
- run: cd test/cube && make
489489

490490
zephyr_examples:

.github/workflows/quicktest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ jobs:
337337
- run: |
338338
if ./test/match_changed_files.sh '^src|examples/stm32/nucleo-*-cube-*'; then
339339
echo GO=1 >> $GITHUB_ENV
340-
# nothing specific to install or do
340+
sudo pip install yq
341341
fi
342342
- if: ${{ env.GO == 1 }}
343343
run: cd test/cube && make

test/cube/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ ROOT ?= $(realpath $(CURDIR)/../..)
22
PROJECTS ?= $(wildcard ../../examples/stm32/nucleo-*-cube-*)
33
TARGET ?= Debug
44
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
87

98
all: $(PROJECTS)
109
$(DOCKER) $(IMAGE) $(PATHTO)headless-build.sh -data workspace -removeAll workspace
1110

1211
$(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)
1413

1514
FORCE:
1615

0 commit comments

Comments
 (0)