Skip to content

Commit eb5583e

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 66e88d7 commit eb5583e

File tree

2 files changed

+60
-25
lines changed

2 files changed

+60
-25
lines changed

.github/workflows/psv_pipelines.yml

Lines changed: 56 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
CXX: g++-7
2323
steps:
2424
- name: Check out repository
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626
- name: "C++ Lint checker script"
2727
run: ./scripts/misc/cpplint_ci.sh
2828
shell: bash
@@ -42,9 +42,9 @@ jobs:
4242
CXX: g++-9
4343
steps:
4444
- name: Check out repository
45-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4646
- name: Install Ubuntu dependencies
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
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
4848
shell: bash
4949
- name: Compile project with cmake and ccache
5050
run: gcc --version && ./scripts/linux/psv/build_psv.sh
@@ -63,7 +63,7 @@ jobs:
6363
CXX: g++-7
6464
steps:
6565
- name: Check out repository
66-
uses: actions/checkout@v2
66+
uses: actions/checkout@v4
6767
- name: Install Ubuntu dependencies
6868
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev libssl-dev libcurl4-openssl-dev gcc-7 g++-7 --no-install-recommends
6969
shell: bash
@@ -78,9 +78,9 @@ jobs:
7878
BUILD_TYPE: RelWithDebInfo
7979
steps:
8080
- name: Check out repository
81-
uses: actions/checkout@v3
81+
uses: actions/checkout@v4
8282
- name: Install Ubuntu dependencies
83-
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev ccache libssl-dev libcurl4-openssl-dev --no-install-recommends
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
8484
shell: bash
8585
- name: Compile project with cmake and ccache
8686
run: gcc --version && ./scripts/linux/psv/build_psv.sh
@@ -95,9 +95,9 @@ jobs:
9595
CXX: g++-13
9696
steps:
9797
- name: Check out repository
98-
uses: actions/checkout@v2
98+
uses: actions/checkout@v4
9999
- name: Install Ubuntu dependencies
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
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
101101
shell: bash
102102
- name: Compile project without cache
103103
run: ./scripts/linux/psv/build_psv_no_cache.sh
@@ -112,9 +112,9 @@ jobs:
112112
CXX: g++-13
113113
steps:
114114
- name: Check out repository
115-
uses: actions/checkout@v3
115+
uses: actions/checkout@v4
116116
- name: Install Ubuntu dependencies
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
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
118118
shell: bash
119119
- name: Compile project with cmake and ccache
120120
run: gcc --version && ./scripts/linux/psv/build_psv.sh
@@ -127,9 +127,9 @@ jobs:
127127
BUILD_TYPE: RelWithDebInfo
128128
steps:
129129
- name: Check out repository
130-
uses: actions/checkout@v2
130+
uses: actions/checkout@v4
131131
- name: Install Ubuntu dependencies
132-
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev libssl-dev libcurl4-openssl-dev --no-install-recommends
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
133133
shell: bash
134134
- name: Compile project without cache
135135
run: ./scripts/linux/psv/build_psv_no_cache.sh
@@ -145,7 +145,7 @@ jobs:
145145
CXX: clang++-7
146146
steps:
147147
- name: Check out repository
148-
uses: actions/checkout@v2
148+
uses: actions/checkout@v4
149149
- name: Install Ubuntu dependencies
150150
run: sudo apt-get update -y && sudo apt-get install clang-7 ccache libcurl4-openssl-dev -y --no-install-recommends --fix-missing
151151
shell: bash
@@ -161,7 +161,7 @@ jobs:
161161
BUILD_TYPE: RelWithDebInfo
162162
steps:
163163
- name: Check out repository
164-
uses: actions/checkout@v2
164+
uses: actions/checkout@v4
165165
- name: Verification of prerequisites
166166
run: env && ls -la $ANDROID_HOME
167167
shell: bash
@@ -174,7 +174,7 @@ jobs:
174174
runs-on: macOS-11
175175
steps:
176176
- name: Check out repository
177-
uses: actions/checkout@v2
177+
uses: actions/checkout@v4
178178
- name: MacOS Build
179179
run: scripts/macos/psv/azure_macos_build_psv.sh
180180
shell: bash
@@ -184,7 +184,7 @@ jobs:
184184
runs-on: macOS-12
185185
steps:
186186
- name: Check out repository
187-
uses: actions/checkout@v2
187+
uses: actions/checkout@v4
188188
- name: MacOS Build
189189
run: scripts/macos/psv/azure_macos_build_psv.sh
190190
shell: bash
@@ -194,7 +194,7 @@ jobs:
194194
runs-on: macOS-11
195195
steps:
196196
- name: Check out repository
197-
uses: actions/checkout@v2
197+
uses: actions/checkout@v4
198198
- name: iOS Xcode 11-7 Build
199199
run: scripts/ios/azure_ios_build_psv.sh
200200
shell: bash
@@ -206,7 +206,7 @@ jobs:
206206
runs-on: macOS-12
207207
steps:
208208
- name: Check out repository
209-
uses: actions/checkout@v2
209+
uses: actions/checkout@v4
210210
- name: iOS Xcode 14-2 Build
211211
run: scripts/ios/azure_ios_build_psv.sh
212212
shell: bash
@@ -216,7 +216,7 @@ jobs:
216216
runs-on: macOS-13
217217
steps:
218218
- name: Check out repository
219-
uses: actions/checkout@v2
219+
uses: actions/checkout@v4
220220
- name: iOS Xcode 15 Build
221221
run: scripts/ios/azure_ios_build_psv.sh
222222
shell: bash
@@ -226,17 +226,52 @@ jobs:
226226
runs-on: macOS-14
227227
steps:
228228
- name: Check out repository
229-
uses: actions/checkout@v2
229+
uses: actions/checkout@v4
230230
- name: iOS Xcode 15 Build
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
237272
if: github.ref_name != 'master'
238273
steps:
239-
- uses: actions/checkout@v3
274+
- uses: actions/checkout@v4
240275
with:
241276
fetch-depth: 0
242277
- name: Set tags env variables.

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)