Merge branch 'fix_github' into 'dev'

Fix github actions run failed. See merge request maix_sw/k230_canmv!251
kendryte · Jun 18, 2024 · 4e81831 · 4e81831
2 parents dd43095 + 1a089a2
commit 4e81831
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -139,7 +139,9 @@ jobs:
           git config --global --add safe.directory $PWD
           git config --global --add safe.directory $PWD/k230_sdk
           git config --global --add safe.directory $PWD/micropython
-          git config --global --add safe.directory $PWD/micropython_port/lvgl/lv_binding_micropython
+          git config --global --add safe.directory $PWD/micropython_port/3d-party/freetype/freetype
+          git config --global --add safe.directory $PWD/micropython_port/3d-party/lvgl/lv_binding_micropython
+          git config --global --add safe.directory $PWD/micropython_port/3d-party/wrap/micropython-wrap
           git config --global --list
           ls -alht
           echo "download toolchain and build env"
@@ -182,7 +184,9 @@ jobs:
               git config --global --add safe.directory $PWD; \
               git config --global --add safe.directory $PWD/k230_sdk; \
               git config --global --add safe.directory $PWD/micropython; \
-              git config --global --add safe.directory $PWD/micropython_port/lvgl/lv_binding_micropython; \
+              git config --global --add safe.directory $PWD/micropython_port/3d-party/freetype/freetype; \
+              git config --global --add safe.directory $PWD/micropython_port/3d-party/lvgl/lv_binding_micropython; \
+              git config --global --add safe.directory $PWD/micropython_port/3d-party/wrap/micropython-wrap; \
               time make CONF=$CONF || exit 1; \
               echo '---show docker build output---'; \
               ls -alht output/${CONF}/images || exit 1"

diff --git a/micropython_port/3d-party/freetype/Makefile b/micropython_port/3d-party/freetype/Makefile
@@ -16,7 +16,9 @@ sync_overlay: $(overlay_dir) $(overlay_file)
 	@rsync -a -q overlay/ freetype/
 	@touch freetype/.ready_sync_file
 
-submodule_init:
+sync_submodule:
 	@git submodule update --init -f freetype
-
-sync_submodule: submodule_init sync_overlay
+	@git -C freetype clean -fdq
+	@rsync -a -q overlay/ freetype/
+	@touch freetype/.ready_sync_dir
+	@touch freetype/.ready_sync_file
diff --git a/micropython_port/3d-party/lvgl/Makefile b/micropython_port/3d-party/lvgl/Makefile
@@ -16,7 +16,9 @@ sync_overlay: $(overlay_dir) $(overlay_file)
 	@rsync -a -q overlay/ lv_binding_micropython/
 	@touch lv_binding_micropython/.ready_sync_file
 
-submodule_init:
+sync_submodule:
 	@git submodule update --init -f lv_binding_micropython
-
-sync_submodule: submodule_init sync_overlay
+	@git -C lv_binding_micropython clean -fdq
+	@rsync -a -q overlay/ lv_binding_micropython/
+	@touch lv_binding_micropython/.ready_sync_dir
+	@touch lv_binding_micropython/.ready_sync_file
diff --git a/micropython_port/3d-party/wrap/Makefile b/micropython_port/3d-party/wrap/Makefile
@@ -16,7 +16,9 @@ sync_overlay: $(overlay_dir) $(overlay_file)
 	@rsync -a -q overlay/ micropython-wrap/
 	@touch micropython-wrap/.ready_sync_file
 
-submodule_init:
+sync_submodule:
 	@git submodule update --init -f micropython-wrap
-
-sync_submodule: submodule_init sync_overlay
+	@git -C micropython-wrap clean -fdq
+	@rsync -a -q overlay/ micropython-wrap/
+	@touch micropython-wrap/.ready_sync_dir
+	@touch micropython-wrap/.ready_sync_file