Skip to content

Commit

Permalink
fix(ci): no hardcoded boost version in ci scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
lotem committed Jan 15, 2022
1 parent 7677dae commit 3ae72a3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 6 deletions.
9 changes: 7 additions & 2 deletions action-install-macos.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
#!/bin/bash

export boost_version="${boost_version=1.75.0}"
boost_x_y_z="${boost_version//./_}"

export BOOST_ROOT="${BOOST_ROOT=$(pwd)/thirdparty/src/boost_${boost_x_y_z}}"

# TODO: cache dependencies

# install and build boost
make xcode/thirdparty/boost

export BOOST_ROOT="$(pwd)/thirdparty/src/boost_1_75_0"

make xcode/thirdparty

if [[ -n "${RIME_PLUGINS}" ]]; then
Expand Down
17 changes: 13 additions & 4 deletions action-install-windows.bat
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
setlocal
set boost_version=1_76_0
aria2c https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_%boost_version%.7z -d C:\Libraries

if not defined boost_version set boost_version=1.76.0
set boost_x_y_z=%boost_version:.=_%

if not defined BOOST_ROOT set BOOST_ROOT=C:\Libraries\boost_%boost_x_y_z%

if exist "%BOOST_ROOT%\boost" goto boost_found
rem download boost source
aria2c https://boostorg.jfrog.io/artifactory/main/release/%boost_version%/source/boost_%boost_x_y_z%.7z -d C:\Libraries
pushd C:\Libraries
7z x boost_%boost_version%.7z
7z x boost_%boost_x_y_z%.7z
popd C:\Libraries
set BOOST_ROOT=C:\Libraries\boost_%boost_version%
:boost_found

rem TODO: cache dependencies

call build.bat boost
if errorlevel 1 goto error
Expand Down

0 comments on commit 3ae72a3

Please sign in to comment.