Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor copyright and CI update #1580

Merged
merged 1 commit into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions .github/workflows/psv_pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,7 @@ jobs:
run: scripts/macos/psv/azure_macos_build_psv.sh
shell: bash

psv-macos-13-xcode-15-build:
name: PSV.MacOS13.Xcode15
runs-on: macos-13-xlarge
steps:
- name: Check out repository
uses: actions/checkout@v4
- name: MacOS Build Xcode15
run: scripts/macos/psv/azure_macos_build_psv.sh
shell: bash

psv-macos-14-xcode-15-build:
psv-macos-14-arm64-xcode-15-build:
name: PSV.MacOS14.Xcode15
runs-on: macos-14
steps:
Expand All @@ -216,7 +206,7 @@ jobs:
run: scripts/macos/psv/azure_macos_build_psv.sh
shell: bash

psv-ios-xcode-15-build:
psv-ios-x86_64-xcode-15-build:
name: PSV.iOS.MacOS13.Xcode15
runs-on: macOS-13
steps:
Expand All @@ -226,7 +216,7 @@ jobs:
run: scripts/ios/azure_ios_build_psv.sh
shell: bash

psv-ios-xcode-14-build:
psv-ios-x86_64-xcode-14-build:
name: PSV.iOS.MacOS13.Xcode14
runs-on: macOS-13
steps:
Expand All @@ -238,7 +228,7 @@ jobs:
env:
USE_LATEST_XCODE: 0

psv-ios-os15-xcode-16-build:
psv-ios-os15-arm64-xcode-16-build:
name: PSV.iOS.MacOS13.Xcode16
runs-on: macOS-15
steps:
Expand All @@ -248,7 +238,7 @@ jobs:
run: scripts/ios/azure_ios_build_psv.sh
shell: bash

psv-ios-os14-xcode-15-build:
psv-ios-os14-arm64-xcode-15-build:
name: PSV.iOS.MacOS14.Xcode15
runs-on: macOS-14
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ For details, see <a href="https://github.com/heremaps/here-data-sdk-cpp/blob/mas

## LICENSE

Copyright (C) 2019–2024 HERE Europe B.V.
Copyright (C) 2019–2025 HERE Europe B.V.

For license details, see the <a href="https://github.com/heremaps/here-data-sdk-cpp/blob/master/LICENSE" target="_blank">LICENSE</a> file in the root of this project.

Expand Down
4 changes: 2 additions & 2 deletions scripts/android/build-test-emulator.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -ex
#
# Copyright (C) 2020-2024 HERE Europe B.V.
# Copyright (C) 2020-2025 HERE Europe B.V.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -73,7 +73,7 @@ echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "emulator" "p
echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI"

# Create emulator
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
echo "yes" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/avdmanager create avd -n android_emulator -k "system-images;android-$ANDROID_API;google_apis;$ANDROID_ABI" --force
echo "AVD created"
emulator -list-avds

Expand Down
6 changes: 3 additions & 3 deletions scripts/ios/fv/gh-actions-functional-network-test.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -ex
#
# Copyright (C) 2021-2024 HERE Europe B.V.
# Copyright (C) 2021-2025 HERE Europe B.V.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -96,14 +96,14 @@ xcrun simctl list
xcrun simctl list devices
xcrun simctl list runtimes

export CurrentDeviceUDID=$(xcrun simctl list devices | grep "iPhone 14 (" | grep -v "unavailable" | grep -v "com.apple.CoreSimulator.SimDeviceType" | cut -d'(' -f2 | cut -d')' -f1 | head -1)
export CurrentDeviceUDID=$(xcrun simctl list devices | grep "iPhone 15 (" | grep -v "unavailable" | grep -v "com.apple.CoreSimulator.SimDeviceType" | cut -d'(' -f2 | cut -d')' -f1 | head -1)

# Create new Simulator device

xcrun simctl list devices | grep ${CurrentDeviceUDID}
xcrun simctl boot ${CurrentDeviceUDID} || true
xcrun simctl list devices | grep ${CurrentDeviceUDID}
xcrun simctl create ${GITHUB_RUN_ID}_iphone14 "com.apple.CoreSimulator.SimDeviceType.iPhone-14"
xcrun simctl create ${GITHUB_RUN_ID}_iphone15 "com.apple.CoreSimulator.SimDeviceType.iPhone-15"
xcrun simctl list devices | grep ${CurrentDeviceUDID}
echo "Simulator created"

Expand Down
Loading