haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

workflows: Remove packages from npm command

Browse source
This commit is contained in:
FintasticMan 2023-06-21 23:27:02 +02:00
parent 9fd014db24
commit de04b9ff0f
No known key found for this signature in database
GPG key ID: A00F1AB6DB1ED386
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/main.yml vendored
View file

@ -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

3
src/displayapp/fonts/CMakeLists.txt
View file

@ -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)

3
src/resources/CMakeLists.txt
View file

@ -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