Skip to content

Commit b19c7f5

Browse files
committed
Add Win build job
Use image with VC 2019 Relates-To: OLPEDGE-2873 Signed-off-by: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>
1 parent 37a0669 commit b19c7f5

File tree

2 files changed

+44
-9
lines changed

2 files changed

+44
-9
lines changed

.github/workflows/psv_pipelines.yml

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Check out repository
4545
uses: actions/checkout@v4
4646
- name: Install Ubuntu dependencies
47-
run: sudo rm /etc/apt/sources.list.d/microsoft-prod.list && sudo apt-get update && sudo apt-get install -y libboost-all-dev ccache libssl-dev libcurl4-openssl-dev gcc-9 g++-9 --no-install-recommends
47+
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev ccache libssl-dev libcurl4-openssl-dev gcc-9 g++-9 --no-install-recommends
4848
shell: bash
4949
- name: Compile project with cmake and ccache
5050
run: gcc --version && ./scripts/linux/psv/build_psv.sh
@@ -80,7 +80,7 @@ jobs:
8080
- name: Check out repository
8181
uses: actions/checkout@v4
8282
- name: Install Ubuntu dependencies
83-
run: sudo rm /etc/apt/sources.list.d/microsoft-prod.list && sudo apt-get update && sudo apt-get install -y libboost-all-dev ccache libssl-dev libcurl4-openssl-dev --no-install-recommends
83+
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev ccache libssl-dev libcurl4-openssl-dev --no-install-recommends
8484
shell: bash
8585
- name: Compile project with cmake and ccache
8686
run: gcc --version && ./scripts/linux/psv/build_psv.sh
@@ -97,7 +97,7 @@ jobs:
9797
- name: Check out repository
9898
uses: actions/checkout@v4
9999
- name: Install Ubuntu dependencies
100-
run: sudo rm /etc/apt/sources.list.d/microsoft-prod.list && sudo add-apt-repository ppa:ubuntu-toolchain-r/test && sudo apt-get update && sudo apt-get install -y libboost-all-dev libssl-dev libcurl4-openssl-dev gcc-13 g++-13 --no-install-recommends
100+
run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test && sudo apt-get update && sudo apt-get install -y libboost-all-dev libssl-dev libcurl4-openssl-dev gcc-13 g++-13 --no-install-recommends
101101
shell: bash
102102
- name: Compile project without cache
103103
run: ./scripts/linux/psv/build_psv_no_cache.sh
@@ -114,7 +114,7 @@ jobs:
114114
- name: Check out repository
115115
uses: actions/checkout@v4
116116
- name: Install Ubuntu dependencies
117-
run: sudo rm /etc/apt/sources.list.d/microsoft-prod.list && sudo add-apt-repository ppa:ubuntu-toolchain-r/test && sudo apt-get update && sudo apt-get install -y libboost-all-dev ccache libssl-dev libcurl4-openssl-dev --no-install-recommends
117+
run: sudo add-apt-repository ppa:ubuntu-toolchain-r/test && sudo apt-get update && sudo apt-get install -y libboost-all-dev ccache libssl-dev libcurl4-openssl-dev --no-install-recommends
118118
shell: bash
119119
- name: Compile project with cmake and ccache
120120
run: gcc --version && ./scripts/linux/psv/build_psv.sh
@@ -129,7 +129,7 @@ jobs:
129129
- name: Check out repository
130130
uses: actions/checkout@v4
131131
- name: Install Ubuntu dependencies
132-
run: sudo rm /etc/apt/sources.list.d/microsoft-prod.list && sudo apt-get update && sudo apt-get install -y libboost-all-dev libssl-dev libcurl4-openssl-dev --no-install-recommends
132+
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev libssl-dev libcurl4-openssl-dev --no-install-recommends
133133
shell: bash
134134
- name: Compile project without cache
135135
run: ./scripts/linux/psv/build_psv_no_cache.sh
@@ -231,6 +231,41 @@ jobs:
231231
run: scripts/ios/azure_ios_build_psv.sh
232232
shell: bash
233233

234+
psv-win-16-vc2019-build:
235+
name: PSV.Win.VC2019
236+
runs-on: windows-2019
237+
env:
238+
BUILD_TYPE: RelWithDebInfo
239+
GENERATOR: "Visual Studio 16 2019"
240+
steps:
241+
- name: Check out repository
242+
uses: actions/checkout@v4
243+
- name: Build
244+
run: scripts/windows/build.sh
245+
shell: bash
246+
247+
psv-win-14-vc2015-build:
248+
name: PSV.Win.VC2015
249+
runs-on: windows-2019
250+
env:
251+
BUILD_TYPE: RelWithDebInfo
252+
GENERATOR: "Visual Studio 14 2015"
253+
strategy:
254+
matrix:
255+
toolset: [ 14.0, 14.XX ]
256+
arch:
257+
- x64
258+
- x86
259+
steps:
260+
- name: Check out repository
261+
uses: actions/checkout@v4
262+
- uses: ilammy/msvc-dev-cmd@v1
263+
with:
264+
arch: ${{ matrix.arch }}
265+
- name: Build
266+
run: scripts/windows/build.sh
267+
shell: bash
268+
234269
psv-commit-checker:
235270
name: PSV.Commit.Checker
236271
runs-on: ubuntu-20.04

scripts/windows/build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -e
22
#
3-
# Copyright (C) 2019-2021 HERE Europe B.V.
3+
# Copyright (C) 2019-2024 HERE Europe B.V.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
1717
# SPDX-License-Identifier: Apache-2.0
1818
# License-Filename: LICENSE
1919

20-
20+
env
2121
[[ -d "build" ]] && rm -rf build
2222
mkdir build && cd build
23-
cmake .. -G "Visual Studio 16 2019" -A x64 \
24-
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
23+
cmake .. -G "${GENERATOR}" -A x64 \
24+
-DBUILD_TYPE=$BUILD_TYPE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
2525
cmake --build . --config $BUILD_TYPE

0 commit comments

Comments
 (0)