Use macos-15-xlarge GitHub runner for ios-ci

.github/actionlint.yaml

@@ -3,6 +3,7 @@ self-hosted-runner:
   labels:
     - macos-14  # can be removed once actionlint is updated
     - ubuntu-24.04  # can be removed once actionlint is updated
+    - macos-15-xlarge
 # Configuration variables in array of strings defined in your repository or
 # organization. `null` means disabling configuration variables check.
 # Empty array means no configuration variable is allowed.

.github/workflows/ios-ci.yml

@@ -83,27 +83,18 @@ jobs:
             ${{ runner.os }}-bazel-
           path: ~/.cache/bazel
 
-      - name: Build Example (Swift) App
-        run: bazel build //platform/ios/app-swift:MapLibreApp --//:renderer=metal
-
-      - name: Check debug symbols
-        run: bazel run //platform:check-public-symbols --//:renderer=metal
-
-      - name: Lint plist files
-        run: bazel run //platform/ios:lint-plists --//:renderer=metal
-
-      - name: Running iOS tests
-        run: bazel test //platform/ios/test:ios_test --test_output=errors --//:renderer=metal
-
-      # tsan run fails with 'Interceptors are not working. This may be because ThreadSanitizer is loaded too late...'
-      #- name: Running iOS UI tests (Thread Sanitizer)
-      #  run: bazel test //platform/ios/iosapp-UITests:uitest --test_output=errors --//:renderer=metal --features=tsan
-
-      - name: Running iOS UI tests (Address+UB Sanitizer)
-        run: bazel test //platform/ios/iosapp-UITests:uitest --test_output=errors --//:renderer=metal --features=include_clang_rt --copt=-fsanitize=undefined --linkopt=-fsanitize=undefined --copt=-fsanitize-recover=null --linkopt=-fsanitize-recover=null
+      - name: Create Bazel config
+        working-directory: platform/darwin
+        run: |
+          grep -v -e APPLE_MOBILE_PROVISIONING_PROFILE_NAME -e APPLE_MOBILE_PROVISIONING_PROFILE_TEAM_ID bazel/example_config.bzl > bazel/config.bzl
+          echo 'APPLE_MOBILE_PROVISIONING_PROFILE_NAME = "MapLibre"' >> bazel/config.bzl
+          echo 'APPLE_MOBILE_PROVISIONING_PROFILE_TEAM_ID = "MapLibre"' >> bazel/config.bzl
+
+      - name: Unlock login keychain
+        run: security unlock-keychain -p 'ec2-user' ~/Library/Keychains/login.keychain-db
 
       # render test
-
+  
       - name: Build RenderTest .ipa and .xctest for AWS Device Farm
         run: |
           set -e
@@ -129,12 +120,31 @@ jobs:
             ${{ env.render_test_artifacts_dir }}/RenderTest.xctest.zip
             ${{ env.render_test_artifacts_dir }}/RenderTestApp.ipa
 
+      - name: Build Example (Swift) App
+        run: bazel build //platform/ios/app-swift:MapLibreApp --//:renderer=metal --//platform/ios:use_provisioning_profile=False
+
+      - name: Check debug symbols
+        run: bazel run //platform:check-public-symbols --//:renderer=metal
+
+      - name: Lint plist files
+        run: bazel run //platform/ios:lint-plists --//:renderer=metal
+
+      - name: Running iOS tests
+        run: bazel test //platform/ios/test:ios_test --test_output=errors --//:renderer=metal
+
+      # tsan run fails with 'Interceptors are not working. This may be because ThreadSanitizer is loaded too late...'
+      #- name: Running iOS UI tests (Thread Sanitizer)
+      #  run: bazel test //platform/ios/iosapp-UITests:uitest --test_output=errors --//:renderer=metal --features=tsan
+
+      - name: Running iOS UI tests (Address+UB Sanitizer)
+        run: bazel test //platform/ios/iosapp-UITests:uitest --test_output=errors --//:renderer=metal --features=include_clang_rt --copt=-fsanitize=undefined --linkopt=-fsanitize=undefined --copt=-fsanitize-recover=null --linkopt=-fsanitize-recover=null --//platform/ios:use_provisioning_profile=False
+
       # C++ unit tests
 
       - name: Build CppUnitTests .ipa and .xctest for AWS Device Farm
         run: |
           set -e
-          bazel run --//:renderer=metal //platform/ios:xcodeproj
+          bazel run //platform/ios:xcodeproj --@rules_xcodeproj//xcodeproj:extra_common_flags="--//:renderer=metal"
           build_dir="$(mktemp -d)"
           xcodebuild build-for-testing  -scheme CppUnitTests -project MapLibre.xcodeproj -derivedDataPath "$build_dir"
           ios_cpp_test_app_dir="$(dirname "$(find "$build_dir" -name CppUnitTestsApp.app)")"

MODULE.bazel

@@ -28,7 +28,9 @@ pnpm = use_extension("@aspect_rules_js//npm:extensions.bzl", "pnpm")
 use_repo(pnpm, "pnpm")
 
 provisioning_profile_repository = use_extension("@build_bazel_rules_apple//apple:apple.bzl", "provisioning_profile_repository_extension")
-provisioning_profile_repository.setup()
+provisioning_profile_repository.setup(
+    fallback_profiles = "//platform/ios/codesign:profiles",
+)
 
 http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 

platform/ios/BUILD.bazel

@@ -1,4 +1,5 @@
 load("@aspect_rules_js//js:defs.bzl", "js_library")
+load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("@build_bazel_rules_apple//apple:apple.bzl", "apple_static_xcframework", "apple_xcframework")
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application", "ios_framework")
 load("@build_bazel_rules_apple//apple:resources.bzl", "apple_resource_bundle")
@@ -196,7 +197,10 @@ ios_application(
     ],
     infoplists = ["info_app_plist"],
     minimum_os_version = "12.0",
-    provisioning_profile = "xcode_profile",
+    provisioning_profile = select({
+        "//platform/ios:with_provisioning_profile": "xcode_profile",
+        "//platform/ios:without_provisioning_profile": None,
+    }),
     resources = _IOS_APPLICATION_RESOURCES,
     version = ":maplibre_app_version",
     visibility = ["//visibility:public"],
@@ -217,7 +221,10 @@ ios_application(
     ],
     infoplists = ["app/Info.plist"],
     minimum_os_version = "12.0",
-    provisioning_profile = ":xcode_profile",
+    provisioning_profile = select({
+        "//platform/ios:with_provisioning_profile": "xcode_profile",
+        "//platform/ios:without_provisioning_profile": None,
+    }),
     resources = _IOS_APPLICATION_RESOURCES,
     visibility = ["//visibility:public"],
     deps = [
@@ -234,7 +241,10 @@ ios_application(
     ],
     infoplists = ["//platform/ios/benchmark:info_benchmark_plist"],
     minimum_os_version = "12.0",
-    provisioning_profile = "xcode_profile",
+    provisioning_profile = select({
+        "//platform/ios:with_provisioning_profile": "xcode_profile",
+        "//platform/ios:without_provisioning_profile": None,
+    }),
     resources = [
         "//platform/ios/benchmark:bundle_resources",
         "//platform/ios/benchmark/assets:benchmark_assets",
@@ -364,3 +374,23 @@ js_library(
     ],
     visibility = ["//platform:__pkg__"],
 )
+
+bool_flag(
+    name = "use_provisioning_profile",
+    build_setting_default = True,
+    visibility = ["//visibility:public"],
+)
+
+config_setting(
+    name = "without_provisioning_profile",
+    flag_values = {
+        "//platform/ios:use_provisioning_profile": "False",
+    },
+)
+
+config_setting(
+    name = "with_provisioning_profile",
+    flag_values = {
+        "//platform/ios:use_provisioning_profile": "True",
+    },
+)

platform/ios/app-swift/BUILD.bazel

@@ -30,7 +30,10 @@ ios_application(
     ],
     infoplists = [":Info.plist"],
     minimum_os_version = "16.0",
-    provisioning_profile = "xcode_profile",
+    provisioning_profile = select({
+        "//platform/ios:with_provisioning_profile": "xcode_profile",
+        "//platform/ios:without_provisioning_profile": None,
+    }),
     resources = [
         "@pois_nps_mbtiles//file",
     ],

platform/ios/codesign/BUILD.bazel

@@ -0,0 +1,5 @@
+filegroup(
+    name = "profiles",
+    srcs = ["MapLibre.mobileprovision"],
+    visibility = ["//visibility:public"],
+)

platform/ios/codesign/MapLibre.plist

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>AppIDName</key>
+  <string>selfsigned: any app</string>
+  <key>ApplicationIdentifierPrefix</key>
+  <array>
+  <string>MapLibre</string>
+  </array>
+  <key>CreationDate</key>
+  <date>2024-10-04T14:42:06Z</date>
+  <key>Platform</key>
+  <array>
+    <string>iOS</string>
+  </array>
+    <key>IsXcodeManaged</key>
+  <true/>
+  <key>DeveloperCertificates</key>
+  <array>
+    <data>MIIDOjCCAiKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMREwDwYDVQQDDAhNYXBM
+      aWJyZTERMA8GA1UECwwITWFwTGlicmUxCzAJBgNVBAYTAk5MMB4XDTI0MTAwNDE0
+      MzIyN1oXDTM0MTAwNDE0MzIyN1owMzERMA8GA1UEAwwITWFwTGlicmUxETAPBgNV
+      BAsMCE1hcExpYnJlMQswCQYDVQQGEwJOTDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+      ADCCAQoCggEBAOpoiqWC3/BZakrK3xnYJK427qY0w0kOVaYiT/pI08VkC7yWbw/k
+      qfRfuUgEnshrkVyPreF//6HDfFZe9sQY1C221nOQB3AAdjj/qpwYDSj+s2zEfOCI
+      Owmp0ZqOe4tu0J6F0xK3KL8f6QP1E1upLixB/ExKX3SfCijNZfeCYElKS7q0o7Di
+      BVD2tpZo3oH5lLBsYbEPYUzkGBRsaiddpcNPSvBGLl+hezchSPL/ZqkyiaNWMiHB
+      cMXl2vf5lm/zp0DwWoVIaX0/pg/l2+u1BxqI/18vQYMs47dVmaIFk+UEduKSq04F
+      Qy8PETNfDNTtE3A/gwDGq3erMCpGU8FXmT8CAwEAAaNZMFcwDgYDVR0PAQH/BAQD
+      AgeAMCYGA1UdJQEB/wQcMBoGCCsGAQUFBwMEBggrBgEFBQcDAwYEVR0lADAdBgNV
+      HQ4EFgQUIrw9BmJNI6k3P0lt70p8qU5qbkAwDQYJKoZIhvcNAQELBQADggEBAEEv
+      yheiEYgoZI0jOXzNc7fZBvU9fgMup7mWBPAK/NQxSoPOMq2NlQsfTT8RmYhjyg27
+      vgLB4Tu+/Yj8SiPZYx3HxpKQmlNn8P+ZLyupIP8haiKA50COpmxc1jtkmF/Rpvf4
+      cDoaIoGhkAIZpMBqDKF5Od6FfwBCzHsbQRKbqg3+4KgaSfFYghor7lkatSJiIlr/
+      zjq//mN99RrWBN/HxtI5gguSEalMtJbIWQvZrIrQUAOgwED6uuJri0BHr5uS94I2
+      tkDgpAmlCwzkJX+KWAx6RzE2/V6QLU2UCQvUFWKMRLEieK1bKtbLO8GNoHFsZSS0
+      sESC3dJn9PUkCj1x0+A=</data>
+  </array>
+  <key>Entitlements</key>
+  <dict>
+    <key>keychain-access-groups</key>
+    <array>
+      <string>MapLibre</string>    
+    </array>
+    <key>get-task-allow</key>
+    <true/>
+    <key>application-identifier</key>
+    <string>MapLibre.*</string>
+    <key>com.apple.developer.team-identifier</key>
+    <string>MapLibre</string>
+  </dict>
+  <key>ExpirationDate</key>
+  <date>2034-10-04T09:54:14Z</date>
+  <key>Name</key>
+  <string>MapLibre</string>
+  <key>ProvisionedDevices</key>
+  <array>
+  </array>
+  <key>LocalProvision</key>
+  <true/>
+  <key>TeamIdentifier</key>
+  <array>
+    <string>MapLibre</string>
+  </array>
+  <key>TeamName</key>
+  <string>MapLibre</string>
+  <key>TimeToLive</key>
+  <integer>3652</integer>
+  <key>UUID</key>
+  <string>B05AAC58-7963-4EA6-B158-F8E43432EDE7</string>
+  <key>Version</key>
+  <integer>1</integer>
+</dict>
+</plist>

platform/ios/codesign/README.md

@@ -0,0 +1,8 @@
+# Self-Signed Provisioning Profile
+
+This directory contains a self-signed provisioning profile.
+
+```
+security import MapLibre.cer
+security cms -S -N 'iOS Team Provisioning Profile: *' -i MapLibre.plist -o MapLibre.mobileprovision
+```

platform/ios/iosapp-UITests/BUILD.bazel

@@ -17,7 +17,10 @@ ios_ui_test(
     name = "uitest",
     size = "large",
     minimum_os_version = "12.0",
-    provisioning_profile = "xcode_profile",
+    provisioning_profile = select({
+        "//platform/ios:with_provisioning_profile": "xcode_profile",
+        "//platform/ios:without_provisioning_profile": None,
+    }),
     test_host = "//platform/ios:App",
     visibility = [
         "@rules_xcodeproj//xcodeproj:generated",

platform/ios/test/common/BUILD.bazel

@@ -42,7 +42,10 @@ ios_application(
         "//render-test/ios:Info.plist",
     ],
     minimum_os_version = "13.0",
-    provisioning_profile = "//platform/ios:xcode_profile",
+    provisioning_profile = select({
+        "//platform/ios:with_provisioning_profile": "//platform/ios:xcode_profile",
+        "//platform/ios:without_provisioning_profile": None,
+    }),
     visibility = [
         "//visibility:public",
     ],

platform/ios/test/core/BUILD.bazel

@@ -50,7 +50,10 @@ ios_application(
         "Info.plist",
     ],
     minimum_os_version = "13.0",
-    provisioning_profile = "//platform/ios:xcode_profile",
+    provisioning_profile = select({
+        "//platform/ios:with_provisioning_profile": "//platform/ios:xcode_profile",
+        "//platform/ios:without_provisioning_profile": None,
+    }),
     deps = [
         "//platform/ios/test/common:test_app_srcs",
     ],
@@ -59,7 +62,10 @@ ios_application(
 ios_unit_test(
     name = "CppUnitTests",
     minimum_os_version = "13.0",
-    provisioning_profile = "//platform/ios:xcode_profile",
+    provisioning_profile = select({
+        "//platform/ios:with_provisioning_profile": "//platform/ios:xcode_profile",
+        "//platform/ios:without_provisioning_profile": None,
+    }),
     test_host = "CppUnitTestsApp",
     visibility = ["@rules_xcodeproj//xcodeproj:generated"],
     deps = [

render-test/ios/BUILD.bazel

@@ -52,7 +52,10 @@ objc_library(
 ios_unit_test(
     name = "RenderTest",
     minimum_os_version = "13.0",
-    provisioning_profile = "//platform/ios:xcode_profile",
+    provisioning_profile = select({
+        "//platform/ios:with_provisioning_profile": "//platform/ios:xcode_profile",
+        "//platform/ios:without_provisioning_profile": None,
+    }),
     runner = "@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
     test_host = "//platform/ios/test/common:RenderTestApp",
     visibility = [