Skip to content

Commit 639966c

Browse files
authored
ci: fix boost issues for win and mac (nerva-project#35)
2 parents 212a2a0 + 4c63a3e commit 639966c

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,12 @@ jobs:
9898
with:
9999
update: true
100100
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-unbound git
101+
- shell: msys2 {0}
102+
run: |
103+
curl -O https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-boost-1.86.0-7-any.pkg.tar.zst
104+
curl -O https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-boost-1.86.0-7-any.pkg.tar.zst.sig
105+
gpg --homedir /etc/pacman.d/gnupg --verify mingw-w64-x86_64-boost-1.86.0-7-any.pkg.tar.zst.sig
106+
pacman --noconfirm -U mingw-w64-x86_64-boost-1.86.0-7-any.pkg.tar.zst
101107
- name: Build
102108
run: |
103109
${{env.CCACHE_SETTINGS}}
@@ -118,8 +124,8 @@ jobs:
118124
restore-keys: ccache-${{ runner.os }}-build-
119125
- name: Install dependencies
120126
run: |
121-
HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf@21 ccache
122-
brew link protobuf@21
127+
HOMEBREW_NO_AUTO_UPDATE=1 brew install boost@1.85 hidapi zmq libpgm miniupnpc ldns expat libunwind-headers protobuf@21 ccache
128+
brew link protobuf@21 boost@1.85
123129
- name: Build
124130
run: |
125131
${{env.CCACHE_SETTINGS}}

contrib/brew/Brewfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ brew "binutils"
1414
brew "coreutils"
1515
brew "cmake"
1616
brew "pkg-config"
17-
brew "boost"
17+
brew "boost@1.85", link: true
1818
brew "openssl"
1919
brew "hidapi"
2020
brew "zmq"

0 commit comments

Comments
 (0)