From 774aa88149d214a917accfadfd236d1f18a9d24b Mon Sep 17 00:00:00 2001 From: Finlay Davidson Date: Wed, 21 Jun 2023 23:27:02 +0200 Subject: [PATCH] workflows: Remove packages from npm command --- .github/workflows/main.yml | 8 ++++---- src/resources/CMakeLists.txt | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 89c1b2764d..29b9c03174 100644 --- 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 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/resources/CMakeLists.txt b/src/resources/CMakeLists.txt index 0983aaffe6..74fab65cba 100644 --- 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)