Skip to content

Commit 35edf30

Browse files
committed
ci: fix build-windows
1 parent a1dc85c commit 35edf30

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,7 @@ jobs:
6868
- uses: msys2/setup-msys2@v2
6969
with:
7070
update: true
71-
install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git
72-
- shell: msys2 {0}
73-
run: |
74-
curl -O https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-protobuf-c-1.4.1-1-any.pkg.tar.zst
75-
curl -O https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-protobuf-21.9-1-any.pkg.tar.zst
76-
pacman --noconfirm -U mingw-w64-x86_64-protobuf-c-1.4.1-1-any.pkg.tar.zst mingw-w64-x86_64-protobuf-21.9-1-any.pkg.tar.zst
71+
install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git pkg-config
7772
- name: build
7873
run: |
7974
${{env.CCACHE_SETTINGS}}

cmake/CheckTrezor.cmake

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,10 @@ endmacro()
7272

7373
# Use Trezor master switch
7474
if (USE_DEVICE_TREZOR)
75-
# Protobuf is required to build protobuf messages for Trezor
76-
include(FindProtobuf OPTIONAL)
77-
7875
# PkgConfig works better with new Protobuf
7976
find_package(PkgConfig QUIET)
80-
pkg_check_modules(PROTOBUF protobuf)
77+
FIND_PACKAGE(Protobuf CONFIG)
8178

82-
if (NOT Protobuf_FOUND)
83-
FIND_PACKAGE(Protobuf CONFIG)
84-
endif()
8579
if (NOT Protobuf_FOUND)
8680
FIND_PACKAGE(Protobuf)
8781
endif()

0 commit comments

Comments
 (0)