workflows: Remove packages from npm command

InfiniTimeOrg · Sep 14, 2023 · 8fddae7 · 8fddae7
1 parent 166b879
commit 8fddae7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -70,15 +70,15 @@ jobs:
       run:  |
         sudo apt-get -y install ninja-build
 
-    - name: Install lv_font_conv
-      run:
-        npm i -g [email protected]
-
     - name: Checkout source files
       uses: actions/checkout@v3
       with:
         submodules: recursive
 
+    - name: Install npm packages
+      run:
+        npm i
+
     - name: Get InfiniSim repo
       run:  |
         git clone https://github.com/InfiniTimeOrg/InfiniSim.git --depth 1 --branch main

diff --git a/src/displayapp/fonts/CMakeLists.txt b/src/displayapp/fonts/CMakeLists.txt
@@ -2,7 +2,8 @@ set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
    jetbrains_mono_extrabold_compressed lv_font_sys_48
    open_sans_light fontawesome_weathericons)
 find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
-   HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
+   HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin"
+   HINTS "${InfiniTime_DIR}/node_modules/.bin")
 message(STATUS "Using ${LV_FONT_CONV} to generate font files")
 configure_file(${CMAKE_CURRENT_LIST_DIR}/jetbrains_mono_bold_20.c_zero.patch
    ${CMAKE_CURRENT_BINARY_DIR}/jetbrains_mono_bold_20.c_zero.patch COPYONLY)

diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt
@@ -1,10 +1,12 @@
 
 find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
-    HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
+    HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin"
+    HINTS "${InfiniTime_DIR}/node_modules/.bin")
 message(STATUS "Using ${LV_FONT_CONV} to generate font files")
 
 find_program(LV_IMG_CONV "lv_img_conv" NO_CACHE REQUIRED
-    HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")
+    HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin"
+    HINTS "${InfiniTime_DIR}/node_modules/.bin")
 message(STATUS "Using ${LV_IMG_CONV} to generate font files")
 
 if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)