Skip to content

Commit

Permalink
enable boost on windows and macos
Browse files Browse the repository at this point in the history
  • Loading branch information
FAlbertDev committed Aug 15, 2024
1 parent 77fbb0d commit 9bef4ab
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions src/scripts/ci/setup_gh_actions.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ param(

choco install -y sccache

# Amalgamation builds also build the examples, which require boost
$amalgamation_targets = @("amalgamation")
if($amalgamation_targets -contains $TARGET ) {
choco install -y boost-msvc-14.3
}

# find the sccache cache location and store it in the build job's environment
$raw_cl = (sccache --stats-format json --show-stats | ConvertFrom-Json).cache_location
$cache_location = ([regex] 'Local disk: "(.*)"').Match($raw_cl).groups[1].value
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/ci/setup_gh_actions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ else
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew install ccache

if [ "$TARGET" = "shared" ]; then
if [ "$TARGET" = "shared" ] || [ "$TARGET" = "amalgamation" ] ; then
brew install boost

# On Apple Silicon we need to specify the include directory
Expand Down
6 changes: 3 additions & 3 deletions src/scripts/ci_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def build_targets(target, target_os):
yield 'bogo_shim'
if target in ['examples']:
yield 'examples'
if target in ['amalgamation'] and target_os in ['linux']:
if target in ['amalgamation']:
yield 'examples'
if target in ['valgrind', 'valgrind-full']:
yield 'ct_selftest'
Expand Down Expand Up @@ -216,7 +216,7 @@ def sanitize_kv(some_string):
if target in ['amalgamation', 'cross-arm64-amalgamation', 'cross-android-arm64-amalgamation']:
flags += ['--amalgamation']

if target in ['amalgamation'] and target_os in ['linux']:
if target in ['amalgamation']:
flags += ['--with-boost']

if target in ['bsi', 'nist']:
Expand Down Expand Up @@ -789,7 +789,7 @@ def main(args=None):
if target in ['examples']:
make_targets += ['examples']

if target in ['amalgamation'] and options.os in ['linux']:
if target in ['amalgamation']:
make_targets += ['examples']

if target in ['valgrind', 'valgrind-full']:
Expand Down

0 comments on commit 9bef4ab

Please sign in to comment.