Adjusted tvos and macos

Author: Reedyuk

.github/workflows/pull_request.yml

@@ -147,7 +147,7 @@ jobs:
           path: "**/firebase-debug.log"
   build-macos:
     needs: jobMatrixSetup
-    runs-on: macos-latest
+    runs-on: macos-15
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.jobMatrixSetup.outputs.macos_test_jobs_matrix) }}
@@ -182,11 +182,11 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: iOS ${{ env.ARCHIVE_KEY }} Firebase Debug Log
+          name: macOS ${{ env.ARCHIVE_KEY }} Firebase Debug Log
           path: "**/firebase-debug.log"
   build-tvos:
     needs: jobMatrixSetup
-    runs-on: macos-latest
+    runs-on: macos-15
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.jobMatrixSetup.outputs.tvos_test_jobs_matrix) }}
@@ -215,13 +215,13 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: iOS ${{ env.ARCHIVE_KEY }} Test Report HTML
+          name: tvOS ${{ env.ARCHIVE_KEY }} Test Report HTML
           path: "**/build/reports/tests/tvosArm64Test/"
       - name: Upload Firebase Debug Log
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: iOS ${{ env.ARCHIVE_KEY }} Firebase Debug Log
+          name: tvOS ${{ env.ARCHIVE_KEY }} Firebase Debug Log
           path: "**/firebase-debug.log"
   build-jvm:
     needs: jobMatrixSetup

convention-plugin-test-option/src/main/kotlin/EmulatorJobsMatrix.kt

@@ -16,6 +16,8 @@ class EmulatorJobsMatrix {
         mapOf(
             "emulator_jobs_matrix.json" to getEmulatorTaskList(rootProject = rootProject),
             "ios_test_jobs_matrix.json" to getIosTestTaskList(rootProject = rootProject),
+            "macos_test_jobs_matrix.json" to getMacosTestTaskList(rootProject = rootProject),
+            "tvos_test_jobs_matrix.json" to getTvosTestTaskList(rootProject = rootProject),
             "js_test_jobs_matrix.json" to getJsTestTaskList(rootProject = rootProject),
             "jvm_test_jobs_matrix.json" to getJvmTestTaskList(rootProject = rootProject)
         )
@@ -41,6 +43,28 @@ class EmulatorJobsMatrix {
             }
         }.map { listOf("cleanTest", it) }
 
+    fun getMacosTestTaskList(rootProject: Project): List<List<String>> =
+        rootProject.subprojects.filter { subProject ->
+            subProject.name == "test-utils" ||
+                    (rootProject.property("${subProject.name}.skipMacosTests") == "true").not()
+        }.map { subProject ->
+            when (val osArch = System.getProperty("os.arch")) {
+                "arm64", "arm-v8", "aarch64" -> "${subProject.path}:macosArm64Test"
+                else -> throw Error("Unexpected System.getProperty(\"os.arch\") = $osArch")
+            }
+        }.map { listOf("cleanTest", it) }
+
+    fun getTvosTestTaskList(rootProject: Project): List<List<String>> =
+        rootProject.subprojects.filter { subProject ->
+            subProject.name == "test-utils" ||
+                    (rootProject.property("${subProject.name}.skipTvosTests") == "true").not()
+        }.map { subProject ->
+            when (val osArch = System.getProperty("os.arch")) {
+                "arm64", "arm-v8", "aarch64" -> "${subProject.path}:tvosSimulatorArm64Test"
+                else -> throw Error("Unexpected System.getProperty(\"os.arch\") = $osArch")
+            }
+        }.map { listOf("cleanTest", it) }
+
     fun getJsTestTaskList(rootProject: Project): List<List<String>> =
         rootProject.subprojects.filter { subProject ->
             subProject.name == "test-utils" ||

gradle.properties

@@ -37,6 +37,38 @@ firebase-messaging.skipIosTests=false
 firebase-perf.skipIosTests=false
 firebase-storage.skipIosTests=true
 
+# Skip Macos Tests
+firebase-analytics.skipMacosTests=true
+firebase-app.skipMacosTests=false
+firebase-auth.skipMacosTests=false
+firebase-common-internal.skipMacosTests=false
+firebase-common.skipMacosTests=false
+firebase-config.skipMacosTests=false
+firebase-crashlytics.skipMacosTests=false
+firebase-database.skipMacosTests=false
+firebase-firestore.skipMacosTests=false
+firebase-functions.skipMacosTests=false
+firebase-installations.skipMacosTests=false
+firebase-messaging.skipMacosTests=false
+firebase-perf.skipMacosTests=false
+firebase-storage.skipMacosTests=true
+
+# Skip Tvos Tests
+firebase-analytics.skipTvosTests=true
+firebase-app.skipTvosTests=false
+firebase-auth.skipTvosTests=false
+firebase-common-internal.skipTvosTests=false
+firebase-common.skipTvosTests=false
+firebase-config.skipTvosTests=false
+firebase-crashlytics.skipTvosTests=false
+firebase-database.skipTvosTests=false
+firebase-firestore.skipTvosTests=false
+firebase-functions.skipTvosTests=false
+firebase-installations.skipTvosTests=false
+firebase-messaging.skipTvosTests=false
+firebase-perf.skipTvosTests=false
+firebase-storage.skipTvosTests=true
+
 # We can have the functionality to skip jvm tests, due to compatibility issues.
 firebase-analytics.skipJvmTests=true
 firebase-app.skipJvmTests=false