Skip to content

Commit c032fa8

Browse files
committed
Update fv_pipelines.yml (#1542)
Remove schedule: run fv pipe for every master commit. Relates-To: MINOR Signed-off-by: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com>
1 parent fe80f1b commit c032fa8

File tree

3 files changed

+45
-13
lines changed

3 files changed

+45
-13
lines changed

.github/workflows/fv_pipelines.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ on:
44
push:
55
branches:
66
- master
7-
schedule:
8-
# FV Android and iOS only once a month besides the master merges runs
9-
- cron: '* 5 1 * *'
107

118
jobs:
129
fv-build-ios-network-test:
@@ -37,4 +34,4 @@ jobs:
3734
run: ls -la ${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake && ls -la ${ANDROID_NDK_HOME}/prebuilt && ls -la ${ANDROID_NDK_HOME}/ndk-build
3835
- name: Android Emulator Test
3936
run: scripts/android/build-test-emulator.sh
40-
shell: bash
37+
shell: bash

.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
@@ -87,7 +87,7 @@ jobs:
8787
- name: Check out repository
8888
uses: actions/checkout@v4
8989
- name: Install Ubuntu dependencies
90-
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
90+
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev ccache libssl-dev libcurl4-openssl-dev --no-install-recommends
9191
shell: bash
9292
- name: Compile project with cmake and ccache
9393
run: gcc --version && ./scripts/linux/psv/build_psv.sh
@@ -104,7 +104,7 @@ jobs:
104104
- name: Check out repository
105105
uses: actions/checkout@v4
106106
- name: Install Ubuntu dependencies
107-
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
107+
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
108108
shell: bash
109109
- name: Compile project without cache
110110
run: ./scripts/linux/psv/build_psv_no_cache.sh
@@ -121,7 +121,7 @@ jobs:
121121
- name: Check out repository
122122
uses: actions/checkout@v4
123123
- name: Install Ubuntu dependencies
124-
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 gcc-13 g++-13 --no-install-recommends
124+
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
125125
shell: bash
126126
- name: Compile project with cmake and ccache
127127
run: gcc --version && ./scripts/linux/psv/build_psv.sh
@@ -136,7 +136,7 @@ jobs:
136136
- name: Check out repository
137137
uses: actions/checkout@v4
138138
- name: Install Ubuntu dependencies
139-
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
139+
run: sudo apt-get update && sudo apt-get install -y libboost-all-dev libssl-dev libcurl4-openssl-dev --no-install-recommends
140140
shell: bash
141141
- name: Compile project without cache
142142
run: ./scripts/linux/psv/build_psv_no_cache.sh
@@ -228,6 +228,41 @@ jobs:
228228
run: scripts/ios/azure_ios_build_psv.sh
229229
shell: bash
230230

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