From 56e41263fd602c86359015aef1feeb6dd39a9dd1 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Tue, 5 Mar 2024 02:46:29 +0100 Subject: [PATCH] Bring back removed script, make sure CI runs on deleted files (#2171) --- .github/workflows/android-ci.yml | 2 +- .github/workflows/ios-ci.yml | 4 ++-- .github/workflows/linux-ci.yml | 4 ++-- .github/workflows/pr-linux-tests.yml | 2 +- platform/ios/framework/Info-static.plist | 26 ++++++++++++++++++++ platform/ios/framework/Info.plist | 30 ++++++++++++++++++++++++ platform/ios/scripts/lint-plists.sh | 13 ++++++++++ 7 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 platform/ios/framework/Info-static.plist create mode 100644 platform/ios/framework/Info.plist create mode 100755 platform/ios/scripts/lint-plists.sh diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml index 269b76615..4438207a4 100644 --- a/.github/workflows/android-ci.yml +++ b/.github/workflows/android-ci.yml @@ -21,7 +21,7 @@ jobs: pre_job: runs-on: ubuntu-latest outputs: - should_skip: ${{ github.event_name != 'workflow_dispatch' && steps.changed-files.outputs.android_any_changed != 'true' }} + should_skip: ${{ github.event_name != 'workflow_dispatch' && steps.changed-files.outputs.android_any_modified != 'true' }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml index 2504e6b37..c914f3b52 100644 --- a/.github/workflows/ios-ci.yml +++ b/.github/workflows/ios-ci.yml @@ -30,7 +30,7 @@ jobs: pre_job: runs-on: ubuntu-latest outputs: - should_skip: ${{ github.event_name != 'workflow_dispatch' && steps.changed-files-yaml.outputs.ios_any_changed != 'true' }} + should_skip: ${{ github.event_name != 'workflow_dispatch' && steps.changed-files-yaml.outputs.ios_any_modified != 'true' }} steps: - uses: actions/checkout@v4 @@ -42,7 +42,7 @@ jobs: files_yaml_from_source_file: .github/changed-files.yml - name: Run step if test file(s) change - if: steps.changed-files-yaml.outputs.ios_any_changed == 'true' + if: steps.changed-files-yaml.outputs.ios_any_modified == 'true' run: | echo "One or more iOS file(s) has changed." echo "List of changes: ${{ steps.changed-files-yaml.outputs.ios_all_changed_files }}" diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml index d5cfd857e..cbe1a8709 100644 --- a/.github/workflows/linux-ci.yml +++ b/.github/workflows/linux-ci.yml @@ -28,7 +28,7 @@ jobs: pre_job: runs-on: ubuntu-22.04 outputs: - should_skip: ${{ github.event_name != 'workflow_dispatch' && steps.changed-files.outputs.linux_any_changed != 'true' }} + should_skip: ${{ github.event_name != 'workflow_dispatch' && steps.changed-files.outputs.linux_any_modified != 'true' }} steps: - uses: actions/checkout@v4 @@ -40,7 +40,7 @@ jobs: files_yaml_from_source_file: .github/changed-files.yml - name: List changed files - if: steps.changed-files.outputs.linux_any_changed == 'true' + if: steps.changed-files.outputs.linux_any_modified == 'true' run: | echo "Changed file(s): ${{ steps.changed-files.outputs.linux_all_changed_files }}" diff --git a/.github/workflows/pr-linux-tests.yml b/.github/workflows/pr-linux-tests.yml index dd812f1af..f48be6aa3 100644 --- a/.github/workflows/pr-linux-tests.yml +++ b/.github/workflows/pr-linux-tests.yml @@ -164,7 +164,7 @@ jobs: - name: Run Benchmarks # excluding the API tests because they hang https://github.com/maplibre/maplibre-native/issues/1808 - run: python3 vendor/benchmark/tools/compare.py --no-color benchmarks ./mbgl-benchmark-runner-main mbgl-benchmark-runner --benchmark_filter='^[^A][^P][^I].*' > benchmark_out.txt + run: python3 vendor/benchmark/tools/compare.py --no-color benchmarks ./mbgl-benchmark-runner-main ./mbgl-benchmark-runner --benchmark_filter='^[^A][^P][^I].*' > benchmark_out.txt - name: Configure AWS Credentials if: github.ref == 'refs/heads/main' && vars.OIDC_AWS_ROLE_TO_ASSUME diff --git a/platform/ios/framework/Info-static.plist b/platform/ios/framework/Info-static.plist new file mode 100644 index 000000000..67e207823 --- /dev/null +++ b/platform/ios/framework/Info-static.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundleShortVersionString + 5.9.0 + CFBundleSignature + ???? + CFBundleVersion + 15256 + MLNCommitHash + $(CURRENT_COMMIT_HASH) + MLNSemanticVersionString + $(CURRENT_SEMANTIC_VERSION) + NSPrincipalClass + + + diff --git a/platform/ios/framework/Info.plist b/platform/ios/framework/Info.plist new file mode 100644 index 000000000..9f1b753a7 --- /dev/null +++ b/platform/ios/framework/Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 5.9.0 + CFBundleSignature + ???? + CFBundleVersion + 15256 + MLNCommitHash + $(CURRENT_COMMIT_HASH) + MLNSemanticVersionString + $(CURRENT_SEMANTIC_VERSION) + NSPrincipalClass + + + diff --git a/platform/ios/scripts/lint-plists.sh b/platform/ios/scripts/lint-plists.sh new file mode 100755 index 000000000..b438e4de2 --- /dev/null +++ b/platform/ios/scripts/lint-plists.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +set -euo pipefail +echo Linting... + +plutil -lint platform/ios/app/Info.plist +plutil -lint platform/ios/bench_UITests/Info.plist +plutil -lint platform/ios/benchmark/Info.plist +plutil -lint platform/ios/framework/Info.plist +plutil -lint platform/ios/framework/Info-static.plist +plutil -lint platform/ios/Integration_Test_Harness/Info.plist +plutil -lint platform/ios/Integration_Tests/Info.plist +plutil -lint platform/ios/iosapp-UITests/Info.plist +plutil -lint platform/ios/test/Info.plist