diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c24e2374..6b040b79 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -74,15 +74,15 @@ jobs: run: | sudo apt-get -y install ninja-build - - name: Install lv_font_conv - run: - npm i -g lv_font_conv@1.5.2 - - 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 index 22627efc..99ca8649 100644 --- 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 index 3834e854..b61a84ea 100644 --- a/src/resources/CMakeLists.txt +++ b/src/resources/CMakeLists.txt @@ -1,6 +1,7 @@ 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.py" NO_CACHE REQUIRED