Skip to content

Commit 833e423

Browse files
committed
Remove duplicate installs from GitHub build workflow
1 parent e959eb6 commit 833e423

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@ CURRENT_DIR = $(shell pwd)
77
# Set the MicroPython user C module path to the OpenCV module
88
MAKE_ARGS = USER_C_MODULES="$(CURRENT_DIR)/src/opencv_upy.cmake"
99

10+
# Ensure we're building the OpenCV board variant
11+
MAKE_ARGS += BOARD_VARIANT=OPENCV
12+
1013
# Use the OpenCV driver manifest
11-
MAKE_ARGS += FROZEN_MANIFEST="$(CURRENT_DIR)/cv2_drivers/manifest.py"
14+
# MAKE_ARGS += FROZEN_MANIFEST="$(CURRENT_DIR)/cv2_drivers/manifest.py"
1215

1316
# Build MicroPython with the OpenCV module
1417
all:
1518
@cd micropython/ports/rp2 && export CMAKE_ARGS="$(CMAKE_ARGS)" && make -f Makefile $(MAKEFLAGS) $(MAKE_ARGS)
1619

1720
# Clean the MicroPython build
1821
clean:
19-
@cd micropython/ports/rp2 && make -f Makefile $(MAKEFLAGS) clean
22+
@cd micropython/ports/rp2 && make -f Makefile $(MAKEFLAGS) $(MAKE_ARGS) clean
2023

2124
# Load the MicroPython submodules
2225
submodules:
23-
@cd micropython/ports/rp2 && make -f Makefile $(MAKEFLAGS) submodules
26+
@cd micropython/ports/rp2 && make -f Makefile $(MAKEFLAGS) $(MAKE_ARGS) submodules

0 commit comments

Comments
 (0)