forked from maplibre/maplibre-native
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'maplibre:main' into main
- Loading branch information
Showing
174 changed files
with
3,904 additions
and
3,889 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,4 @@ | ||
| coverage --experimental_ui_max_stdouterr_bytes=10485760 | ||
| # TODO: remove with bazel 7.x | ||
| common --enable_bzlmod | ||
|
|
||
| coverage --experimental_ui_max_stdouterr_bytes=10485760 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 6.2.0 | ||
| 6.4.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,9 +9,35 @@ on: | |
| jobs: | ||
| create-check: | ||
| strategy: | ||
| max-parallel: 2 | ||
| matrix: | ||
| test: [ | ||
| {artifactName: android-render-tests, testFile: RenderTests.apk, appFile: RenderTestsApp.apk, name: "Android Render Tests"}, | ||
| { | ||
| artifactName: android-render-tests, | ||
| testFile: RenderTests.apk, | ||
| appFile: RenderTestsApp.apk, | ||
| name: "Android Render Tests", | ||
| # Google Pixel 7 Pro | ||
| devicePool: "arn:aws:devicefarm:us-west-2:373521797162:devicepool:20687d72-0e46-403e-8f03-0941850665bc/9692fe7f-86a9-4ecc-908f-175600968564" | ||
| }, | ||
| { | ||
| artifactName: benchmarkAPKs, | ||
| testFile: "MapboxGLAndroidSDKTestApp-drawable-release-androidTest.apk", | ||
| appFile: "MapboxGLAndroidSDKTestApp-drawable-release.apk", | ||
| name: "Android Benchmark", | ||
| testFilter: "org.maplibre.android.benchmark.Benchmark", | ||
| # echo '{"styleNames": [...], "styleURLs": [...], "resultsAPI: "..." }' > benchmark-input.json | ||
| # zip benchmark-input.zip benchmark-input.json | ||
| # aws devicefarm create-upload --project-arn <project_arn> --type EXTERNAL_DATA --name benchmark-input.zip | ||
| # curl -T benchmark-input.zip <upload_url> | ||
| # aws devicefarm get-upload <arn> | ||
| externalData: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/c27174c2-63f4-4cdb-9af9-68957d75ebed", | ||
| # top devices, query with `aws list-device-pools --arn <project_arn>` | ||
| devicePool: "arn:aws:devicefarm:us-west-2::devicepool:082d10e5-d7d7-48a5-ba5c-b33d66efa1f5", | ||
| # benchmark-android.yaml | ||
| # see https://github.com/maplibre/ci-runners/tree/main/aws-device-farm/custom-test-envs | ||
| testSpecArn: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/14862afb-cf88-44aa-9f1e-5131cbb22f01" | ||
| } | ||
| ] | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
|
|
@@ -24,7 +50,20 @@ jobs: | |
| app_id: ${{ secrets.MAPLIBRE_NATIVE_BOT_APP_ID }} | ||
| private_key: ${{ secrets.MAPLIBRE_NATIVE_BOT_PRIVATE_KEY }} | ||
|
|
||
| - run: echo "${{ toJSON(github.event.workflow_run) }}" | ||
|
|
||
| - uses: ./.github/actions/get-pr-number | ||
| id: get-pr-number | ||
|
|
||
| - name: Check if comment on PR contains '!benchmark android' | ||
| uses: peter-evans/find-comment@v2 | ||
| id: fc | ||
| with: | ||
| issue-number: ${{ steps.get-pr-number.outputs.pr-number }} | ||
| body-regex: '^!benchmark.*android.*$' | ||
|
|
||
| - uses: LouisBrunner/[email protected] | ||
| if: matrix.test.name != 'Android Benchmark' || steps.fc.outputs.comment-id | ||
| id: create_check | ||
| with: | ||
| token: ${{ steps.generate_token.outputs.token }} | ||
|
|
@@ -34,32 +73,37 @@ jobs: | |
| sha: ${{ github.event.workflow_run.head_sha }} | ||
|
|
||
| - uses: ./.github/actions/download-workflow-run-artifact | ||
| if: matrix.test.name != 'Android Benchmark' || steps.fc.outputs.comment-id | ||
| with: | ||
| artifact-name: ${{ matrix.test.artifactName }} | ||
|
|
||
| - name: Check if test files exist (otherwise the parent workflow was skipped) | ||
| if: matrix.test.name != 'Android Benchmark' || steps.fc.outputs.comment-id | ||
| id: check_files | ||
| uses: andstor/[email protected] | ||
| with: | ||
| files: "${{ matrix.test.testFile }}, ${{ matrix.test.appFile }}" | ||
|
|
||
| - uses: ./.github/actions/aws-device-farm-run | ||
| if: steps.check_files.outputs.files_exists == 'true' | ||
| if: steps.check_files.outputs.files_exists == 'true' && (matrix.test.name != 'Android Benchmark' || steps.fc.outputs.comment-id) | ||
| with: | ||
| name: ${{ matrix.test.name }} | ||
| appType: ANDROID_APP | ||
| appFile: ${{ matrix.test.appFile }} | ||
| testFile: ${{ matrix.test.testFile }} | ||
| testPackageType: INSTRUMENTATION_TEST_PACKAGE | ||
| testType: INSTRUMENTATION | ||
| testFilter: ${{ matrix.test.testFilter }} | ||
| AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} | ||
| AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} | ||
| AWS_ROLE_TO_ASSUME: ${{ vars.AWS_ROLE_TO_ASSUME }} | ||
| AWS_DEVICE_FARM_PROJECT_ARN: ${{ vars.AWS_DEVICE_FARM_PROJECT_ARN }} | ||
| AWS_DEVICE_FARM_DEVICE_POOL_ARN: ${{ vars.AWS_DEVICE_FARM_DEVICE_POOL_ARN }} | ||
| AWS_DEVICE_FARM_DEVICE_POOL_ARN: ${{ matrix.test.devicePool }} | ||
| externalData: ${{ matrix.test.externalData }} | ||
| testSpecArn: ${{ matrix.test.testSpecArn }} | ||
|
|
||
| - uses: LouisBrunner/[email protected] | ||
| if: always() | ||
| if: always() && (matrix.test.name != 'Android Benchmark' || steps.fc.outputs.comment-id) | ||
| with: | ||
| token: ${{ steps.generate_token.outputs.token }} | ||
| check_id: ${{ steps.create_check.outputs.check_id }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| module(name = "maplibre") | ||
|
|
||
| bazel_dep(name = "bazel_skylib", version = "1.5.0") | ||
| bazel_dep(name = "rules_apple", version = "3.1.1", repo_name = "build_bazel_rules_apple") | ||
| bazel_dep(name = "rules_swift", version = "1.13.0", repo_name = "build_bazel_rules_swift") | ||
| bazel_dep(name = "rules_xcodeproj", version = "1.13.0") | ||
|
|
||
| provisioning_profile_repository = use_extension("@build_bazel_rules_apple//apple:apple.bzl", "provisioning_profile_repository_extension") | ||
| provisioning_profile_repository.setup() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +0,0 @@ | ||
| workspace(name = "Maplibre") | ||
|
|
||
| load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") | ||
|
|
||
| http_archive( | ||
| name = "build_bazel_rules_apple", | ||
| sha256 = "34c41bfb59cdaea29ac2df5a2fa79e5add609c71bb303b2ebb10985f93fa20e7", | ||
| url = "https://github.com/bazelbuild/rules_apple/releases/download/3.1.1/rules_apple.3.1.1.tar.gz", | ||
| ) | ||
|
|
||
| http_archive( | ||
| name = "rules_xcodeproj", | ||
| sha256 = "f5c1f4bea9f00732ef9d54d333d9819d574de7020dbd9d081074232b93c10b2c", | ||
| url = "https://github.com/MobileNativeFoundation/rules_xcodeproj/releases/download/1.13.0/release.tar.gz", | ||
| ) | ||
|
|
||
| load( | ||
| "@rules_xcodeproj//xcodeproj:repositories.bzl", | ||
| "xcodeproj_rules_dependencies", | ||
| ) | ||
|
|
||
| xcodeproj_rules_dependencies() | ||
|
|
||
| load("@bazel_features//:deps.bzl", "bazel_features_deps") | ||
|
|
||
| bazel_features_deps() | ||
|
|
||
| load( | ||
| "@build_bazel_rules_apple//apple:repositories.bzl", | ||
| "apple_rules_dependencies", | ||
| ) | ||
|
|
||
| apple_rules_dependencies() | ||
|
|
||
| load( | ||
| "@build_bazel_rules_swift//swift:repositories.bzl", | ||
| "swift_rules_dependencies", | ||
| ) | ||
|
|
||
| swift_rules_dependencies() | ||
|
|
||
| load( | ||
| "@build_bazel_rules_swift//swift:extras.bzl", | ||
| "swift_rules_extra_dependencies", | ||
| ) | ||
|
|
||
| swift_rules_extra_dependencies() | ||
|
|
||
| load( | ||
| "@build_bazel_apple_support//lib:repositories.bzl", | ||
| "apple_support_dependencies", | ||
| ) | ||
|
|
||
| apple_support_dependencies() | ||
|
|
||
| load( | ||
| "@build_bazel_rules_apple//apple:apple.bzl", | ||
| "provisioning_profile_repository" | ||
| ) | ||
|
|
||
| provisioning_profile_repository( | ||
| name = "local_provisioning_profiles" | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.