Skip to content

Commit 80f5dcc

Browse files
Minor CI fixes (#1488)
Fix minor CI jobs switch to latest Ubuntu and macOS in FV jobs remove hardcoded git plugin version. update minor npm tool version: `follow-redirects` run FV only on master. Resolves: MINOR-CI-FIXES Signed-off-by: Yaroslav Stefinko <ext-yaroslav.stefinko@here.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 55b7000 commit 80f5dcc

File tree

5 files changed

+54
-44
lines changed

5 files changed

+54
-44
lines changed

.github/workflows/fv_pipelines.yml

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,40 @@
11
name: FV_Pipelines
22

33
on:
4-
schedule:
5-
# temporary run job only once a month.
4+
push:
5+
branches:
6+
- master
7+
schedule:
8+
# FV Android and iOS only once a month besides the master merges runs
69
- cron: '* 5 1 * *'
710

8-
env:
9-
LD_PRELOAD: /lib/x86_64-linux-gnu/libSegFault.so
10-
SEGFAULT_SIGNALS: all
11-
1211
jobs:
1312
fv-build-ios-network-test:
1413
name: FV / iOS clang / Network tests
15-
runs-on: macos-10.15
14+
runs-on: macos-latest
1615
env:
1716
BUILD_TYPE: RelWithDebInfo
1817
steps:
1918
- name: Check out repository
20-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2120
- name: Build with tests
2221
run: ./scripts/ios/fv/gh-actions-build-with-tests-fv.sh
2322
shell: bash
24-
- name: Test FV Network
23+
- name: Test iOS FV Network
2524
run: ./scripts/ios/fv/gh-actions-functional-network-test.sh
2625
shell: bash
2726

28-
fv-android-amulator-build-test:
29-
name: MV.Android.Emulator.Build.Test.API21.ABIx86_64.NDK-Latest.
30-
runs-on: ubuntu-20.04
27+
fv-android-emulator-build-test:
28+
name: FV.Android.Emulator.Build.Test.API21.ABIx86_64.NDK-22.
29+
runs-on: ubuntu-latest
3130
env:
32-
ANDROID_NDK_HOME: $(ANDROID_HOME)/ndk-bundle
31+
SEGFAULT_SIGNALS: all
32+
BUILD_TYPE: RelWithDebInfo
3333
steps:
3434
- name: Check out repository
35-
uses: actions/checkout@v2
35+
uses: actions/checkout@v4
3636
- name: Verification of cmake script
37-
run: ls -la $(ANDROID_NDK_HOME)/build/cmake/android.toolchain.cmake
38-
shell: bash
37+
run: ls -la ${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake && ls -la ${ANDROID_NDK_HOME}/prebuilt && ls -la ${ANDROID_NDK_HOME}/ndk-build
3938
- name: Android Emulator Test
40-
run: ANDROID_NDK_HOME=$(ANDROID_NDK_HOME) && scripts/android/build-test-emulator.sh
39+
run: scripts/android/build-test-emulator.sh
4140
shell: bash

scripts/android/build-test-emulator.sh

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -ex
22
#
3-
# Copyright (C) 2020-2021 HERE Europe B.V.
3+
# Copyright (C) 2020-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,24 +17,37 @@
1717
# SPDX-License-Identifier: Apache-2.0
1818
# License-Filename: LICENSE
1919

20+
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --list
21+
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk;22.1.7171670" --sdk_root=${ANDROID_HOME} >/dev/null
22+
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-21"
23+
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "platform-tools"
24+
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "ndk-bundle"
25+
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --list
26+
2027
#
21-
# API and ABI are hardcoded there
28+
# API / ABI / NDK are hardcoded below
2229
#
23-
# Android Only Variables
30+
# Variables
2431
export ANDROID_ABI="x86_64"
2532
export ANDROID_API=21
26-
27-
export NDK_ROOT=$ANDROID_HOME/ndk-bundle # This var is not exist on Azure MacOS image, step can be skipped on GitLab
33+
export ANDROID_NDK_ROOT="/usr/local/lib/android/sdk/ndk/22.1.7171670"
34+
export ANDROID_NDK="/usr/local/lib/android/sdk/ndk/22.1.7171670"
35+
export ANDROID_NDK_HOME="/usr/local/lib/android/sdk/ndk/22.1.7171670"
36+
ls -la android-ndk-r22b-linux || true
37+
ls -la /usr/local/lib/android/sdk/ndk/22.1.7171670 || true
38+
ls -la /usr/local/lib/android/sdk/ndk/22.1.7171670/android-ndk-r22b-linux || true
39+
export NDK_ROOT=$ANDROID_NDK_ROOT/ndk-bundle # This var is not exist on Azure MacOS image, step can be skipped on other CI
2840
echo "NDK_ROOT is ${NDK_ROOT} , ANDROID_HOME is ${ANDROID_HOME} " # as we already set this var inside docker image.
2941
ls -la $ANDROID_HOME
30-
export PATH=$PATH:$ANDROID_HOME/tools/bin/:$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools
42+
export PATH=$PATH:$ANDROID_HOME/tools/bin/:$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools:$ANDROID_HOME/cmdline-tools/latest/bin/
3143

44+
# Start compilation
3245
mkdir -p build && cd build
3346

3447
echo ""
3548
echo ""
3649
echo "*************** $VARIANT Build SDK for C++ ********** Start ***************"
37-
CMAKE_COMMAND="cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE=$NDK_ROOT/build/cmake/android.toolchain.cmake \
50+
CMAKE_COMMAND="cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_TYPE=${BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake \
3851
-DANDROID_PLATFORM=android-$ANDROID_API -DANDROID_STL=c++_static -DANDROID_ABI=$ANDROID_ABI"
3952
BUILD_COMMAND="cmake --build . -- -j4"
4053

@@ -51,16 +64,16 @@ echo " ---- Calling ${BUILD_COMMAND}"
5164
${BUILD_COMMAND}
5265
cd -
5366

54-
sdkmanager --list
67+
${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --list
5568

5669
# Add emulator if not already added. Needed for docker.
57-
echo "y" | sdkmanager "emulator" "platforms;android-$ANDROID_API"
70+
echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "emulator" "platforms;android-$ANDROID_API"
5871

5972
# Install AVD files
60-
echo "y" | sdkmanager --install "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI"
73+
echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI"
6174

6275
# Create emulator
63-
echo "no" | avdmanager create avd -n android_emulator -k "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI" --force
76+
echo "no" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/avdmanager create avd -n android_emulator -k "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI" --force
6477
echo "AVD created"
6578
emulator -list-avds
6679

scripts/ios/fv/gh-actions-build-with-tests-fv.sh

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash -e
22
#
3-
# Copyright (C) 2021 HERE Europe B.V.
3+
# Copyright (C) 2021-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,19 +17,17 @@
1717
# SPDX-License-Identifier: Apache-2.0
1818
# License-Filename: LICENSE
1919

20-
mkdir -p build && cd build
20+
# Getting rid of boost installed to the CI image (not clear when it appeared)
21+
# asciidoc and source-highlight are using it so dependencies are ignored.
22+
# Sometimes there is no boost and there is no need to fail in this case.
23+
brew uninstall --ignore-dependencies boost || true
2124

22-
xcode-select -p
23-
if [[ ${GITHUB_RUN_ID} != "" ]]; then
24-
# Run on GH Actions CI
25-
# Using Xcode_11 pre-installed on node. Otherwise, compilation may fail.
26-
sudo xcode-select -s /Applications/Xcode_11.2.1.app
27-
fi
28-
xcode-select -p
25+
mkdir -p build && cd build
2926

3027
cmake ../ -GXcode \
3128
-DCMAKE_TOOLCHAIN_FILE=../cmake/toolchains/iOS.cmake \
3229
-DCMAKE_BUILD_TYPE=$BUILD_TYPE \
30+
-DBUILD_TYPE=${BUILD_TYPE} \
3331
-DPLATFORM=iphoneos \
3432
-DOLP_SDK_ENABLE_TESTING=ON \
3533
-DSIMULATOR=YES \

scripts/ios/fv/gh-actions-functional-network-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ else
6363
echo ">>> Installing mock server SSL certificate into OS... >>>"
6464
# Import and Make trusted
6565
sudo security import mock-server-cert.pem
66-
sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain mock-server-cert.pem
66+
sudo security authorizationdb write com.apple.trust-settings.admin allow; sudo security add-trusted-cert -d -r trustRoot -k /Library/Keychains/System.keychain mock-server-cert.pem ; sudo security authorizationdb remove com.apple.trust-settings.admin || true
6767
# Validate cert: if trusted - succeeded , if not trusted - fails
6868
sudo security verify-cert -c mock-server-cert.pem
6969
echo ">>> Starting Mock Server... >>>"

tests/utils/mock-server/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)