Merge pull request #1142 from square/sedwards/ci-changes

Changing CI Emulator & Action Config

Author: steve-the-edwards

.github/workflows/kotlin.yml

@@ -7,6 +7,9 @@ on :
   pull_request :
   merge_group :
 
+env:
+  ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL: 720 # 12 minutes; default is 20s
+
 # If CI is already running for a branch when that branch is updated, cancel the older jobs.
 concurrency :
   group : ci-${{ github.ref }}-${{ github.head_ref }}
@@ -267,15 +270,13 @@ jobs :
   performance-tests :
     name : Performance tests
     runs-on : macos-latest
-    timeout-minutes : 30
+    timeout-minutes : 45
     strategy :
       # Allow tests to continue on other devices if they fail on one device.
       fail-fast : false
       matrix :
         api-level :
-          - 29
-      # Unclear that older versions actually honor command to disable animation.
-      # Newer versions are reputed to be too slow: https://github.com/ReactiveCircus/android-emulator-runner/issues/222
+          - 31
     steps :
       - uses : actions/checkout@v3
 
@@ -290,15 +291,13 @@ jobs :
   instrumentation-tests :
     name : Instrumentation tests
     runs-on : macos-latest
-    timeout-minutes : 45
+    timeout-minutes : 60
     strategy :
       # Allow tests to continue on other devices if they fail on one device.
       fail-fast : false
       matrix :
-        # Unclear that older versions actually honor command to disable animation.
-        # Newer versions are reputed to be too slow: https://github.com/ReactiveCircus/android-emulator-runner/issues/222
         api-level :
-          - 29
+          - 31
         ### <start-connected-check-shards>
         shardNum : [ 1, 2, 3 ]
         ### <end-connected-check-shards>
@@ -317,13 +316,13 @@ jobs :
   runtime-instrumentation-tests :
     name : Conflate Stale Renderings Instrumentation tests
     runs-on : macos-latest
-    timeout-minutes : 45
+    timeout-minutes : 60
     strategy :
       # Allow tests to continue on other devices if they fail on one device.
       fail-fast : false
       matrix :
         api-level :
-          - 29
+          - 31
         ### <start-connected-check-shards>
         shardNum : [ 1, 2, 3 ]
         ### <end-connected-check-shards>