Skip to content

Commit

Permalink
better boost install
Browse files Browse the repository at this point in the history
  • Loading branch information
FAlbertDev committed Aug 15, 2024
1 parent 9bef4ab commit 08df35f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
6 changes: 0 additions & 6 deletions src/scripts/ci/setup_gh_actions.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ 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
4 changes: 3 additions & 1 deletion src/scripts/ci/setup_gh_actions_after_vcvars.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
#
# Botan is released under the Simplified BSD License (see license.txt)

if ($args[0] -in @('shared')) {
$targets_with_boost = @("shared", "amalgamation")

if ($targets_with_boost -contains $args[0]) {
nuget install -NonInteractive -OutputDirectory $env:DEPENDENCIES_LOCATION -Version 1.79.0 boost

$boostincdir = Join-Path -Path $env:DEPENDENCIES_LOCATION -ChildPath "boost.1.79.0/lib/native/include"
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/ci_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ def sanitize_kv(some_string):
flags += ['--with-commoncrypto']

def add_boost_support(target, target_os):
if target in ['coverage', 'shared']:
if target in ['coverage', 'shared', 'amalgamation']:
return True

if target == 'sanitizer' and target_os == 'linux':
Expand Down

0 comments on commit 08df35f

Please sign in to comment.