Skip to content

Commit 757d83d

Browse files
committed
Merge branch 'fk_workflows' into 'master'
Update Github Workflows See merge request qs/ore-github!27
2 parents ce43b9e + 6b987a7 commit 757d83d

3 files changed

Lines changed: 81 additions & 2 deletions

File tree

.github/workflows/build_windows.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: C/C++ CI Windows
33
on:
44
push:
55
branches: [master]
6+
release:
7+
types: [published]
68
pull_request:
79
branches: [master]
810
types: [ready_for_review, opened, synchronize, reopened]
@@ -23,14 +25,23 @@ jobs:
2325
build:
2426
name: building
2527
runs-on: windows-2022
28+
strategy:
29+
matrix:
30+
include:
31+
- arch: x86
32+
platform: Win32
33+
boost-lib: 32
34+
- arch: AMD64
35+
platform: x64
36+
boost-lib: 64
2637
steps:
2738
- uses: actions/checkout@v3
2839
- name: get QuantLib
2940
run: |
3041
git submodule update --init
3142
- name: Set up Boost
3243
run: |
33-
$Url = "https://boostorg.jfrog.io/artifactory/main/release/1.72.0/binaries/boost_1_72_0-msvc-14.2-64.exe"
44+
$Url = "https://boostorg.jfrog.io/artifactory/main/release/1.72.0/binaries/boost_1_72_0-msvc-14.2-${{ matrix.boost-lib }}.exe"
3445
(New-Object System.Net.WebClient).DownloadFile($Url, "$env:TEMP\boost.exe")
3546
Start-Process -Wait -FilePath "$env:TEMP\boost.exe" "/SILENT","/SP-","/SUPPRESSMSGBOXES","/DIR=C:\local\boost"
3647
choco install -y ninja
@@ -44,3 +55,9 @@ jobs:
4455
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Vc\Auxiliary\Build\vcvarsall.bat" amd64 -vcvars_ver=14.3 || exit 1
4556
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 -L
4657
cmake --build . -j 2 --verbose
58+
- name: Save executables as artifacts
59+
#if: startsWith(github.ref, 'refs/tags/v')
60+
uses: actions/upload-artifact@v3
61+
with:
62+
name: ore-exe-windows
63+
path: D:\a\Engine\Engine\build\App\ore.exe

.github/workflows/linux_build.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ name: C/C++ CI Ubuntu
33
on:
44
push:
55
branches: [master]
6+
release:
7+
types: [published]
68
pull_request:
79
branches: [master]
810
types: [ready_for_review, opened, synchronize, reopened]
@@ -33,6 +35,12 @@ jobs:
3335
sudo apt update
3436
sudo apt install -y libboost-all-dev libboost-test-dev ninja-build
3537
- name: cmake configure
36-
run : mkdir build; cd build; 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 -G "Ninja" ..
38+
run : mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=false -DQL_BUILD_EXAMPLES=false -DQL_BUILD_TEST_SUITE=false -DQL_BUILD_BENCHMARK=false -DQL_ENABLE_SESSIONS=true -DORE_BUILD_DOC=false -G "Ninja" ..
3739
- name: cmake build
3840
run: cd build/; pwd; cmake --build . -j $(nproc)
41+
- name: Save executables as artifacts
42+
if: startsWith(github.ref, 'refs/tags/v')
43+
uses: actions/upload-artifact@v3
44+
with:
45+
name: ore-exe-linux
46+
path: /home/runner/work/Engine/Engine/build/App/ore
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: C/C++ MacOS
2+
3+
on:
4+
push:
5+
branches: [master]
6+
release:
7+
types: [published]
8+
pull_request:
9+
branches: [master]
10+
types: [ready_for_review, opened, synchronize, reopened]
11+
paths:
12+
- .github/workflows/macos_ARM64_build.yaml
13+
- ./App/**
14+
- ./OREAnalytics/**
15+
- '!./OREAnalytics/doc/**'
16+
- ./OREData/**
17+
- '!./OREData/doc/**'
18+
- ./ORETest/**
19+
- ./QuantExt/**
20+
- '!./QuantExt/doc/**'
21+
- CMakeLists.txt
22+
workflow_dispatch:
23+
24+
jobs:
25+
build:
26+
runs-on: macos-11
27+
steps:
28+
- uses: actions/checkout@v3
29+
- name: get QuantLib
30+
run: |
31+
git submodule update --init
32+
- name: Install Boost
33+
run: |
34+
curl -O -L https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.gz
35+
tar xfz boost_1_80_0.tar.gz
36+
cd boost_1_80_0
37+
./bootstrap.sh
38+
./b2 architecture=arm address-model=64 -s NO_LZMA=1 -s NO_ZSTD=1 abi=aapcs install
39+
- name: cmake configure and build
40+
env:
41+
BOOST_ROOT: C:\local\boost
42+
shell: cmd
43+
run: |
44+
mkdir build
45+
cd build
46+
cmake .. -DCMAKE_OSX_ARCHITECTURES=arm64 -DORE_USE_ZLIB=ON -DBUILD_SHARED_LIBS=false -DORE_BUILD_DOC=OFF -DORE_BUILD_EXAMPLES=OFF -DORE_BUILD_TESTS=OFF -DORE_BUILD_APP=ON -DQL_BUILD_BENCHMARK=OFF -DQL_BUILD_EXAMPLES=OFF -DQL_BUILD_TEST_SUITE=OFF -DQL_ENABLE_SESSIONS=ON -DCMAKE_BUILD_TYPE=Release ..
47+
cmake --build . -j4
48+
cmake --install .
49+
- name: Save executables as artifacts
50+
if: startsWith(github.ref, 'refs/tags/v')
51+
uses: actions/upload-artifact@v3
52+
with:
53+
name: ore-macos-arm64
54+
path: /Users/runner/work/Engine/Engine/build/App/ore

0 commit comments

Comments
 (0)