Skip to content

Commit b0d55f2

Browse files
committed
Add gcc-7 on 20.04
And use gcc-7 by specifying CC and CXX. Relates-To: OLPEDGE-2776 Signed-off-by: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>
1 parent b2a8e33 commit b0d55f2

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

.github/workflows/psv_pipelines.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,18 @@ jobs:
1717
psv-linux-gcc-build-test-codecov:
1818
name: PSV / Linux gcc 7.5 / Tests / Code coverage
1919
runs-on: ubuntu-20.04
20+
env:
21+
BUILD_TYPE: RelWithDebInfo
22+
CC: gcc-7
23+
CXX: g++-7
2024
steps:
2125
- name: Check out repository
2226
uses: actions/checkout@v2
2327
- name: "C++ Lint checker script"
2428
run: ./scripts/misc/cpplint_ci.sh
2529
shell: bash
2630
- name: Install Ubuntu dependencies
27-
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev ccache libssl-dev libcurl4-openssl-dev --no-install-recommends
31+
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev ccache libssl-dev libcurl4-openssl-dev gcc-7 g++-7 --no-install-recommends
2832
shell: bash
2933
- name: Compile project with cmake and ccache
3034
run: gcc --version && ./scripts/linux/psv/build_psv.sh
@@ -43,11 +47,13 @@ jobs:
4347
runs-on: ubuntu-20.04
4448
env:
4549
BUILD_TYPE: RelWithDebInfo
50+
CC: gcc-7
51+
CXX: g++-7
4652
steps:
4753
- name: Check out repository
4854
uses: actions/checkout@v2
4955
- name: Install Ubuntu dependencies
50-
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev libssl-dev libcurl4-openssl-dev --no-install-recommends
56+
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
5157
shell: bash
5258
- name: Compile project without cache
5359
run: ./scripts/linux/psv/build_psv_no_cache.sh

scripts/linux/psv/build_psv_no_cache.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -ex
22
#
3-
# Copyright (C) 2021 HERE Europe B.V.
3+
# Copyright (C) 2021-2022 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.
@@ -20,7 +20,7 @@
2020
mkdir -p build
2121
cd build
2222

23-
cmake \
23+
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
2424
-DOLP_SDK_ENABLE_TESTING=OFF \
2525
-DOLP_SDK_ENABLE_DEFAULT_CACHE=OFF \
2626
-DOLP_SDK_ENABLE_DEFAULT_CACHE_LMDB=OFF \

0 commit comments

Comments
 (0)