Skip to content

Commit 626588f

Browse files
Switch CI to ubuntu 22.04 (#1605)
Following github actions changes. For more details, see: actions/runner-images#11101 updated distros has different set of software versions so gcc7 updatad to gcc9, clang7 updated to clang11 clang11 found warnings in the project code and in the boost that other compilers are OK with so silenced that warning for clang Relates-To: DATASDK-73 Signed-off-by: Rustam Gamidov <ext-rustam.gamidov@here.com>
1 parent 6577a87 commit 626588f

File tree

2 files changed

+24
-27
lines changed

2 files changed

+24
-27
lines changed

.github/workflows/psv_pipelines.yml

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,21 @@ env:
1212
SEGFAULT_SIGNALS: all
1313

1414
jobs:
15-
psv-linux-20-04-gcc7-build-cpplint:
16-
name: PSV.Linux.20.04.gcc7.Cpplint
17-
runs-on: ubuntu-20.04
15+
psv-linux-22-04-gcc9-build-cpplint:
16+
name: PSV.Linux.22.04.gcc9.Cpplint
17+
runs-on: ubuntu-22.04
1818
env:
19-
LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
2019
BUILD_TYPE: RelWithDebInfo
21-
CC: gcc-7
22-
CXX: g++-7
20+
CC: gcc-9
21+
CXX: g++-9
2322
steps:
2423
- name: Check out repository
2524
uses: actions/checkout@v4
2625
- name: "C++ Lint checker script"
2726
run: ./scripts/misc/cpplint_ci.sh
2827
shell: bash
2928
- name: Install Ubuntu dependencies
30-
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
29+
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
3130
shell: bash
3231
- name: Compile project with cmake and ccache
3332
run: gcc --version && ./scripts/linux/psv/build_psv.sh
@@ -60,19 +59,18 @@ jobs:
6059
env:
6160
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
6261

63-
psv-linux-20-04-gcc7-build-no-cache:
64-
name: PSV.Linux.20.04.gcc7.OLP_SDK_ENABLE_DEFAULT_CACHE=OFF
65-
runs-on: ubuntu-20.04
62+
psv-linux-22-04-gcc9-build-no-cache:
63+
name: PSV.Linux.22.04.gcc9.OLP_SDK_ENABLE_DEFAULT_CACHE=OFF
64+
runs-on: ubuntu-22.04
6665
env:
67-
LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
6866
BUILD_TYPE: RelWithDebInfo
69-
CC: gcc-7
70-
CXX: g++-7
67+
CC: gcc-9
68+
CXX: g++-9
7169
steps:
7270
- name: Check out repository
7371
uses: actions/checkout@v4
7472
- name: Install Ubuntu dependencies
75-
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
73+
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev libssl-dev libcurl4-openssl-dev gcc-9 g++-9 --no-install-recommends
7674
shell: bash
7775
- name: Compile project without cache
7876
run: ./scripts/linux/psv/build_psv_no_cache.sh
@@ -142,29 +140,28 @@ jobs:
142140
run: ./scripts/linux/psv/build_psv_no_cache.sh
143141
shell: bash
144142

145-
psv-linux-20-04-clang-build:
146-
name: PSV.Linux.20.04.clang
147-
runs-on: ubuntu-20.04
143+
psv-linux-22-04-clang-build:
144+
name: PSV.Linux.22.04.clang
145+
runs-on: ubuntu-22.04
148146
env:
149-
LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
150147
BUILD_TYPE: RelWithDebInfo
151-
CC: clang-7
152-
CXX: clang++-7
148+
CC: clang-11
149+
CXX: clang++-11
150+
CXXFLAGS: -Wno-deprecated-copy
153151
steps:
154152
- name: Check out repository
155153
uses: actions/checkout@v4
156154
- name: Install Ubuntu dependencies
157-
run: sudo apt-get update -y && sudo apt-get install clang-7 ccache libcurl4-openssl-dev -y --no-install-recommends --fix-missing
155+
run: sudo apt-get update -y && sudo apt-get install clang-11 ccache libcurl4-openssl-dev -y --no-install-recommends --fix-missing
158156
shell: bash
159157
- name: Compile project on Clang
160158
run: scripts/linux/psv/build_psv.sh
161159
shell: bash
162160

163-
psv-android-20-04-build:
164-
name: PSV.Linux.Android.20.04
165-
runs-on: ubuntu-20.04
161+
psv-android-22-04-build:
162+
name: PSV.Linux.Android.22.04
163+
runs-on: ubuntu-22.04
166164
env:
167-
LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
168165
BUILD_TYPE: RelWithDebInfo
169166
steps:
170167
- name: Check out repository
@@ -263,7 +260,7 @@ jobs:
263260

264261
psv-commit-checker:
265262
name: PSV.Commit.Checker
266-
runs-on: ubuntu-20.04
263+
runs-on: ubuntu-22.04
267264
if: github.ref_name != 'master'
268265
steps:
269266
- uses: actions/checkout@v4

scripts/linux/psv/build_psv.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ulimit -c unlimited
2626
mkdir -p build
2727
cd build
2828
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
29-
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror" \
29+
-DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror $CXXFLAGS" \
3030
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
3131
-DOLP_SDK_BUILD_EXAMPLES=ON \
3232
-DBUILD_SHARED_LIBS=ON \

0 commit comments

Comments
 (0)