Skip to content

Commit f8dfe71

Browse files
committed
gha: build - fix boost build
1 parent e81d2f0 commit f8dfe71

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,14 +176,13 @@ jobs:
176176
key: ${{ matrix.os }}-boost-${{ env.BOOST_VERSION }}
177177
- if: ${{ ((runner.os == 'Windows') && steps.cache-boost.outputs.cache-hit != 'true' ) }} # || runner.os == 'Linux'
178178
name: Download and build Boost
179-
shell: cmd
180179
run: |
181180
curl -L https://archives.boost.io/release/${{env.BOOST_VERSION}}/source/boost_${{env.BOOST_VERSION_UNDERSCORE}}.zip --output boost-${{ env.BOOST_VERSION }}.zip
182181
7z x boost-${{ env.BOOST_VERSION }}.zip
183-
del boost-${{ env.BOOST_VERSION }}.zip
182+
rm boost-${{ env.BOOST_VERSION }}.zip
184183
cd ${{github.workspace}}/boost_${{env.BOOST_VERSION_UNDERSCORE}}
185-
bootstrap.bat
186-
b2 -j8 address-model=64 architecture=x86 link=static threading=multi runtime-link=shared --with-system stage
184+
& .\bootstrap.bat
185+
.\b2 -j8 address-model=64 link=static threading=multi runtime-link=shared --with-system stage
187186
# we need to build boost in order to get the CMake config it seems...
188187

189188
#- if: runner.os == 'Linux'
@@ -196,7 +195,7 @@ jobs:
196195
- if: runner.os == 'Windows'
197196
name: Set up VR modules (Windows)
198197
run: |
199-
"OPENIA_CMAKE_OPTIONS=${{env.OPENIA_CMAKE_OPTIONS}} -DModule_ImNDT:BOOL=YES -DModule_VRAnnotation:BOOL=YES -DModule_XVRA:BOOL=YES -DBoost_DIR=${{github.workspace}}/boost_${{env.BOOST_VERSION_UNDERSCORE}}/stage/lib/cmake/Boost-${{env.BOOST_VERSION}}" >> $env:GITHUB_ENV
198+
"OPENIA_CMAKE_OPTIONS=${{env.OPENIA_CMAKE_OPTIONS}} -DModule_ImNDT:BOOL=YES -DModule_VRAnnotation:BOOL=YES -DModule_XVRA:BOOL=YES -DBoost_DIR:PATH=${{github.workspace}}/boost_${{env.BOOST_VERSION_UNDERSCORE}}/stage/lib/cmake/Boost-${{env.BOOST_VERSION}}" >> $env:GITHUB_ENV
200199
# - if: runner.os == 'Linux'
201200
# name: Set up VR modules (Linux)
202201
# run: |

0 commit comments

Comments
 (0)