Skip to content

Commit 726286a

Browse files
committed
Update linux_build.yaml
branches should be a list
1 parent 3cf9ae2 commit 726286a

2 files changed

Lines changed: 13 additions & 11 deletions

File tree

.github/workflows/build_windows.yaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,17 @@ jobs:
1515
git submodule update --init
1616
- name: Set up Boost
1717
run: |
18-
choco install -y boost-msvc-14.3
18+
$Url = "https://boostorg.jfrog.io/artifactory/main/release/1.83.0/binaries/boost_1_83_0-msvc-14.3-64.exe"
19+
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
20+
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\local\boost"
1921
choco install -y ninja
20-
- name: cmake configure
21-
run : |
22+
- name: cmake configure and build
23+
env:
24+
BOOST_ROOT: C:\local\boost
25+
shell: cmd
26+
run: |
2227
mkdir build
2328
cd build
24-
cmake -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_ROOT="C:\ProgramData\chocolatey\lib\boost" -G "Ninja" ..
25-
- name: cmake build
26-
run: |
27-
cd build/
28-
pwd;
29-
cmake --build . -j $NUMBER_OF_PROCESSORS
29+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Vc\Auxiliary\Build\vcvarsall.bat" amd64 -vcvars_ver=14.3 || exit 1
30+
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\lib64-msvc-14.3 -D_WIN32_WINNT=0x0600 -L
31+
cmake --build . -j 2 --verbose

.github/workflows/linux_build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: C/C++ CI
22

33
on:
44
push:
5-
branches: master
5+
branches: [master]
66
pull_request:
7-
branches: master
7+
branches: [master]
88
types: [ready_for_review, opened, synchronize, reopened]
99
paths:
1010
- .github/workflows/linux_build.yaml

0 commit comments

Comments
 (0)