Skip to content

Commit e28751d

Browse files
authored
Merge branch 'master' into publish-flutter
2 parents f6741fa + e988925 commit e28751d

File tree

320 files changed

+119497
-97004
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+119497
-97004
lines changed

.github/ISSUE_TEMPLATE/http2.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
name: "package:http2"
3+
about: "Create a bug or file a feature request against package:http2."
4+
labels: "package:http2"
5+
---
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
name: "package:http_multi_server"
3+
about: "Create a bug or file a feature request against package:http_multi_server."
4+
labels: "package:http_multi_server"
5+
---
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
name: "package:http_parser"
3+
about: "Create a bug or file a feature request against package:http_parser."
4+
labels: "package:http_parser"
5+
---
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
name: "package:web_socket_channel"
3+
about: "Create a bug or file a feature request against package:web_socket_channel."
4+
labels: "package:web_socket_channel"
5+
---

.github/labeler.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,40 @@
22

33
'type-infra':
44
- changed-files:
5-
- any-glob-to-any-file: '.github/**'
5+
- any-glob-to-any-file: '.github/**'
66

77
'package:cronet_http':
88
- changed-files:
9-
- any-glob-to-any-file: 'pkgs/cronet_http/**'
9+
- any-glob-to-any-file: 'pkgs/cronet_http/**'
1010

1111
'package:cupertino_http':
1212
- changed-files:
13-
- any-glob-to-any-file: 'pkgs/cupertino_http/**'
13+
- any-glob-to-any-file: 'pkgs/cupertino_http/**'
1414

1515
'package:http':
1616
- changed-files:
17-
- any-glob-to-any-file: 'pkgs/http/**'
17+
- any-glob-to-any-file: 'pkgs/http/**'
18+
19+
'package:http2':
20+
- changed-files:
21+
- any-glob-to-any-file: 'pkgs/http2/**'
1822

1923
'package:http_client_conformance_tests':
2024
- changed-files:
21-
- any-glob-to-any-file: 'pkgs/http_client_conformance_tests/**'
25+
- any-glob-to-any-file: 'pkgs/http_client_conformance_tests/**'
26+
27+
'package:http_multi_server':
28+
- changed-files:
29+
- any-glob-to-any-file: 'pkgs/http_multi_server/**'
30+
31+
'package:http_parser':
32+
- changed-files:
33+
- any-glob-to-any-file: 'pkgs/http_parser/**'
34+
35+
'package:web_socket_channel':
36+
- changed-files:
37+
- any-glob-to-any-file: 'pkgs/web_socket_channel/**'
38+
39+
'package:web_socket_conformance_tests':
40+
- changed-files:
41+
- any-glob-to-any-file: 'pkgs/http_client_conformance_tests/**'

.github/workflows/cronet.yml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,22 @@ env:
2323
jobs:
2424
verify:
2525
name: Format & Analyze & Test
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-cpu16-ram64
27+
timeout-minutes: 30
2728
strategy:
29+
fail-fast: false
2830
matrix:
2931
cronetHttpNoPlay: ['false', 'true']
3032
defaults:
3133
run:
3234
working-directory: pkgs/cronet_http
3335
steps:
34-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
35-
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9
36+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
37+
- uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12
3638
with:
3739
distribution: 'zulu'
3840
java-version: '17'
39-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
41+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
4042
with:
4143
channel: 'stable'
4244
- id: install
@@ -48,15 +50,28 @@ jobs:
4850
- name: Analyze code
4951
if: always() && steps.install.outcome == 'success'
5052
run: flutter analyze --fatal-infos
53+
- name: Enable KVM group perms
54+
run: |
55+
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
56+
sudo udevadm control --reload-rules
57+
sudo udevadm trigger --name-match=kvm
5158
- name: Run tests
52-
uses: reactivecircus/android-emulator-runner@77986be26589807b8ebab3fde7bbf5c60dabec32
59+
uses: reactivecircus/android-emulator-runner@62dbb605bba737720e10b196cb4220d374026a6d
5360
if: always() && steps.install.outcome == 'success'
5461
with:
5562
# api-level/minSdkVersion should be help in sync in:
5663
# - .github/workflows/cronet.yml
5764
# - pkgs/cronet_http/android/build.gradle
5865
# - pkgs/cronet_http/example/android/app/build.gradle
59-
api-level: 21
66+
67+
# Google Play services does not support older Android API levels;
68+
# as of March 2025, they supported API level 23 and higher. Instead
69+
# of breaking when support for API level 23 is removed, just run
70+
# the tests that rely on Google Play services with the newest API
71+
# level (34 as of March 2025). The tests that don't rely on Google
72+
# Play serviecs can test the oldest supported API level.
73+
api-level: ${{ matrix.cronetHttpNoPlay == 'true' && '21' || '29' }}
74+
disable-animations: true
6075
arch: x86_64
6176
target: ${{ matrix.cronetHttpNoPlay == 'true' && 'default' || 'google_apis' }}
6277
script: cd pkgs/cronet_http/example && flutter test --dart-define=cronetHttpNoPlay=${{ matrix.cronetHttpNoPlay }} --timeout=1200s integration_test/

.github/workflows/cupertino.yml

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ env:
2121
PUB_ENVIRONMENT: bot.github
2222

2323
jobs:
24-
verify:
25-
name: Format & Analyze & Test
24+
macos:
25+
name: "macOS: Format & Analyze & Test"
2626
runs-on: macos-latest
2727
defaults:
2828
run:
@@ -31,10 +31,13 @@ jobs:
3131
matrix:
3232
# Test on the minimum supported flutter version and the latest
3333
# version.
34-
flutter-version: ["3.22.0", "any"]
34+
flutter-version: ["3.24.0", "any"]
35+
# It would be nice to test on older versions of macOS but macOS 13 is
36+
# the oldest supported by GitHub.
37+
os: [macos-13, macos-latest]
3538
steps:
36-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
37-
- uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1
39+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
40+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
3841
with:
3942
flutter-version: ${{ matrix.flutter-version }}
4043
channel: 'stable'
@@ -47,12 +50,38 @@ jobs:
4750
- name: Analyze code
4851
run: flutter analyze --fatal-infos
4952
if: always() && steps.install.outcome == 'success'
50-
- uses: futureware-tech/simulator-action@bfa03d93ec9de6dacb0c5553bbf8da8afc6c2ee9
53+
- name: Run tests
54+
run: |
55+
cd example
56+
flutter pub get
57+
flutter test -d macos integration_test/main.dart --test-randomize-ordering-seed=random
58+
ios:
59+
name: "iOS: Test"
60+
runs-on: macos-latest
61+
defaults:
62+
run:
63+
working-directory: pkgs/cupertino_http
64+
strategy:
65+
fail-fast: false
66+
matrix:
67+
# Test on the minimum supported flutter version and the latest
68+
# version.
69+
flutter-version: ["3.24.0", "any"]
70+
steps:
71+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
72+
- uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff
73+
with:
74+
flutter-version: ${{ matrix.flutter-version }}
75+
channel: 'stable'
76+
- id: install
77+
name: Install dependencies
78+
run: flutter pub get
79+
- uses: futureware-tech/simulator-action@dab10d813144ef59b48d401cd95da151222ef8cd
5180
with:
5281
os: iOS
53-
os_version: '>=12.0'
82+
os_version: '>=13.0'
5483
- name: Run tests
5584
run: |
5685
cd example
5786
flutter pub get
58-
flutter test integration_test/main.dart
87+
flutter test integration_test/main.dart --test-randomize-ordering-seed=random

0 commit comments

Comments
 (0)