Skip to content

Commit 0c82e14

Browse files
author
Farah Khashman
committed
update windows workflow
1 parent d772337 commit 0c82e14

1 file changed

Lines changed: 2 additions & 14 deletions

File tree

.github/workflows/build_windows.yaml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
branches: [master]
1212
types: [ready_for_review, opened, synchronize, reopened]
1313
paths:
14-
- .github/workflows/linux_build.yaml
1514
- ./App/**
1615
- ./OREAnalytics/**
1716
- '!./OREAnalytics/doc/**'
@@ -41,16 +40,6 @@ jobs:
4140
- name: get QuantLib
4241
run: |
4342
git submodule update --init
44-
- name: Set up zlib
45-
run: |
46-
$Url = "https://www.zlib.net/zlib131.zip"
47-
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\zlib.zip")
48-
Expand-Archive -Path "$env:TEMP\zlib.zip" -DestinationPath C:\local
49-
cd C:\local\zlib-1.3.1
50-
mkdir build
51-
cd build
52-
cmake ..
53-
cmake --build . --config Release
5443
- name: Set up Boost
5544
run: |
5645
$Url = "https://boostorg.jfrog.io/artifactory/main/release/1.72.0/binaries/boost_1_72_0-msvc-14.2-${{ matrix.boost-lib }}.exe"
@@ -64,9 +53,8 @@ jobs:
6453
run: |
6554
mkdir build
6655
cd build
67-
SET ZLIB_ROOT=C:\local\zlib-1.3.1
68-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Vc\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} -vcvars_ver=14.3 || exit 1
69-
cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DQL_BUILD_EXAMPLES=false -DQL_BUILD_TEST_SUITE=false -DQL_BUILD_BENCHMARK=false -DQL_ENABLE_SESSIONS=true -DORE_USE_ZLIB=ON -DORE_BUILD_DOC=false -DBOOST_INCLUDEDIR=C:\local\boost -DZLIB_LIBRARY=C:\local\zlib-1.3.1\build\Release\zlib.lib -DBOOST_LIBRARYDIR=C:\local\boost\lib64-msvc-14.3 -L
56+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Vc\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }} -vcvars_ver=14.2 || exit 1
57+
cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DQL_BUILD_EXAMPLES=false -DQL_BUILD_TEST_SUITE=false -DQL_BUILD_BENCHMARK=false -DQL_ENABLE_SESSIONS=true -DORE_BUILD_DOC=false -DBOOST_INCLUDEDIR=C:\local\boost -DBOOST_LIBRARYDIR=C:\local\boost\lib${{ matrix.boost-lib }}-msvc-14.2 -L
7058
cmake --build . -j 2 --verbose
7159
- name: Save executables as artifacts
7260
if: startsWith(github.ref, 'refs/tags/v')

0 commit comments

Comments
 (0)