Merge remote-tracking branch 'upstream/master' into cronet_profile

dart-lang · May 9, 2024 · 9c17426 · 9c17426
2 parents 35d5f77 + fdb0d36
commit 9c17426
Show file tree

Hide file tree

Showing 28 changed files with 1,550 additions and 1,294 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,3 +9,7 @@ updates:
       interval: monthly
     labels:
       - autosubmit
+    groups:
+      github-actions:
+        patterns:
+          - "*"
diff --git a/.github/workflows/cronet.yml b/.github/workflows/cronet.yml
@@ -32,7 +32,7 @@ jobs:
         working-directory: pkgs/cronet_http
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
         with:
           distribution: 'zulu'
           java-version: '17'

diff --git a/.github/workflows/cupertino.yml b/.github/workflows/cupertino.yml
@@ -49,9 +49,10 @@ jobs:
         if: always() && steps.install.outcome == 'success'
       - uses: futureware-tech/simulator-action@bfa03d93ec9de6dacb0c5553bbf8da8afc6c2ee9
         with:
-          model: 'iPhone 8'
+          os: iOS
+          os_version: '>=12.0'
       - name: Run tests
         run: |
           cd example
           flutter pub get
-          flutter test --timeout=1200s integration_test/main.dart
+          flutter test integration_test/main.dart
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml