Skip to content

Commit 8dc0bc5

Browse files
ZGaopengZGaopeng
committed
feat: migrate CI to use Flutter stable channel and update dependencies
1 parent c5eaf3b commit 8dc0bc5

File tree

4 files changed

+22
-75
lines changed

4 files changed

+22
-75
lines changed

‎.github/workflows/run_test.yml

Lines changed: 19 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,6 @@ jobs:
8686
integration_test_android:
8787
name: Run Flutter Android Integration Tests
8888
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
89-
strategy:
90-
fail-fast: false
91-
matrix:
92-
version: ["3.7.0", "3.24.5"]
9389
runs-on: ubuntu-latest
9490
timeout-minutes: 120
9591
env:
@@ -103,7 +99,7 @@ jobs:
10399
java-version: '17'
104100
- uses: subosito/flutter-action@v2
105101
with:
106-
flutter-version: ${{ matrix.version }}
102+
channel: 'stable'
107103
cache: true
108104
- name: Enable KVM
109105
run: |
@@ -124,10 +120,6 @@ jobs:
124120
integration_test_ios:
125121
name: Run Flutter iOS Integration Tests
126122
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
127-
strategy:
128-
fail-fast: false
129-
matrix:
130-
version: ["3.7.0", "3.16"]
131123
runs-on: macos-latest
132124
timeout-minutes: 120
133125
env:
@@ -136,7 +128,7 @@ jobs:
136128
- uses: actions/checkout@v3
137129
- uses: subosito/flutter-action@v2
138130
with:
139-
flutter-version: ${{ matrix.version }}
131+
channel: 'stable'
140132
cache: true
141133
- uses: futureware-tech/simulator-action@v3
142134
with:
@@ -160,16 +152,12 @@ jobs:
160152
uses: actions/upload-artifact@v4
161153
if: always()
162154
with:
163-
name: logs-ios-${{ matrix.version }}
155+
name: logs-ios-stable
164156
path: logs-ios/*
165157

166158
integration_test_macos:
167159
name: Run Flutter macOS Integration Tests
168160
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
169-
strategy:
170-
fail-fast: false
171-
matrix:
172-
version: ["3.7.0"]
173161
runs-on: macos-latest
174162
timeout-minutes: 120
175163
env:
@@ -178,7 +166,7 @@ jobs:
178166
- uses: actions/checkout@v3
179167
- uses: subosito/flutter-action@v2
180168
with:
181-
flutter-version: ${{ matrix.version }}
169+
channel: 'stable'
182170
cache: true
183171
- run: flutter config --enable-macos-desktop
184172
- run: bash ci/run_flutter_macos_integration_test.sh
@@ -206,7 +194,7 @@ jobs:
206194
uses: actions/upload-artifact@v4
207195
if: always()
208196
with:
209-
name: iris-logs-macos-${{ matrix.version }}
197+
name: iris-logs-macos-stable
210198
path: iris-logs-macos/*
211199

212200
integration_test_swiftpm:
@@ -240,10 +228,6 @@ jobs:
240228
integration_test_windows:
241229
name: Run Flutter Windows Integration Tests
242230
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
243-
strategy:
244-
fail-fast: false
245-
matrix:
246-
version: ["3.7.0", "3.24.5"]
247231
runs-on: windows-2022
248232
timeout-minutes: 120
249233
env:
@@ -252,7 +236,7 @@ jobs:
252236
- uses: actions/checkout@v3
253237
- uses: subosito/flutter-action@v2
254238
with:
255-
flutter-version: ${{ matrix.version }}
239+
channel: 'stable'
256240
cache: true
257241
- name: Set up crash dump environment
258242
run: .\ci\setup-crash-dumps.ps1
@@ -267,15 +251,12 @@ jobs:
267251
uses: actions/upload-artifact@v4
268252
if: always()
269253
with:
270-
name: windows-crash-dumps-${{ matrix.version }}
254+
name: windows-crash-dumps-stable
271255
path: ./CrashDumps/*
272256

273257
integration_test_web:
274258
name: Run Flutter Web Integration Tests
275259
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
276-
strategy:
277-
matrix:
278-
version: ["3.24.5"]
279260
runs-on: ubuntu-latest
280261
timeout-minutes: 60
281262
env:
@@ -284,7 +265,7 @@ jobs:
284265
- uses: actions/checkout@v3
285266
- uses: subosito/flutter-action@v2
286267
with:
287-
flutter-version: ${{ matrix.version }}
268+
channel: 'stable'
288269
cache: true
289270
- name: Run web integration test
290271
shell: bash
@@ -295,10 +276,6 @@ jobs:
295276
build_android_ubuntu:
296277
name: Build Android on Ubuntu
297278
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
298-
strategy:
299-
fail-fast: false
300-
matrix:
301-
version: ["3.7.12", "3.24.5"] # Need 3.7.12 to build with Gradle 8.x https://github.com/flutter/flutter/issues/124838
302279
runs-on: ubuntu-latest
303280
steps:
304281
- uses: actions/checkout@v3
@@ -309,7 +286,7 @@ jobs:
309286
java-version: '17'
310287
- uses: subosito/flutter-action@v2
311288
with:
312-
flutter-version: ${{ matrix.version }}
289+
channel: 'stable'
313290
cache: true
314291
- run: flutter pub get
315292
- name: Run flutter build apk
@@ -319,10 +296,6 @@ jobs:
319296
build_android_windows:
320297
name: Build Android on Windows
321298
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
322-
strategy:
323-
fail-fast: false
324-
matrix:
325-
version: ["3.7.12", "3.24.5"] # Need 3.7.12 to build with Gradle 8.x https://github.com/flutter/flutter/issues/124838
326299
runs-on: windows-2022
327300
steps:
328301
- uses: actions/checkout@v3
@@ -333,7 +306,7 @@ jobs:
333306
java-version: '17'
334307
- uses: subosito/flutter-action@v2
335308
with:
336-
flutter-version: ${{ matrix.version }}
309+
channel: 'stable'
337310
cache: true
338311
- run: flutter pub get
339312
- name: Run flutter build apk
@@ -343,17 +316,13 @@ jobs:
343316
build_ios:
344317
name: Build iOS
345318
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
346-
strategy:
347-
fail-fast: false
348-
matrix:
349-
version: ["3.7.12"]
350319
runs-on: macos-latest
351320
timeout-minutes: 120
352321
steps:
353322
- uses: actions/checkout@v3
354323
- uses: subosito/flutter-action@v2
355324
with:
356-
flutter-version: ${{ matrix.version }}
325+
channel: 'stable'
357326
cache: true
358327
- run: flutter pub get
359328
- name: Run flutter build ios --no-codesign
@@ -364,16 +333,13 @@ jobs:
364333
build_ios_xcode_15:
365334
name: Build iOS with xcode 15.x
366335
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
367-
strategy:
368-
matrix:
369-
version: ["3.24.5"]
370336
runs-on: macos-13
371337
timeout-minutes: 120
372338
steps:
373339
- uses: actions/checkout@v3
374340
- uses: subosito/flutter-action@v2
375341
with:
376-
flutter-version: ${{ matrix.version }}
342+
channel: 'stable'
377343
cache: true
378344
- run: | # https://github.com/actions/runner-images/issues/6746#issuecomment-1380042553
379345
# set xcode version to use for build
@@ -389,17 +355,13 @@ jobs:
389355
build_web:
390356
name: Build Web
391357
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
392-
strategy:
393-
fail-fast: false
394-
matrix:
395-
version: ["3.7.0", "3.24.5"]
396358
runs-on: ubuntu-latest
397359
timeout-minutes: 120
398360
steps:
399361
- uses: actions/checkout@v3
400362
- uses: subosito/flutter-action@v2
401363
with:
402-
flutter-version: ${{ matrix.version }}
364+
channel: 'stable'
403365
cache: true
404366
- run: flutter packages get
405367
- name: Run flutter build web
@@ -422,7 +384,7 @@ jobs:
422384
java-version: '17'
423385
- uses: subosito/flutter-action@v2
424386
with:
425-
flutter-version: "3.24.5"
387+
channel: 'stable'
426388
cache: true
427389
- name: Enable KVM
428390
run: |
@@ -449,9 +411,6 @@ jobs:
449411
rendering_test_ios:
450412
name: Run Flutter iOS Rendering Tests
451413
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
452-
strategy:
453-
matrix:
454-
version: ["3.24.5"]
455414
runs-on: macos-13 # Rendering test on ios simulator need macos 13+
456415
timeout-minutes: 60
457416
env:
@@ -460,7 +419,7 @@ jobs:
460419
- uses: actions/checkout@v1
461420
- uses: subosito/flutter-action@v2
462421
with:
463-
flutter-version: ${{ matrix.version }}
422+
channel: 'stable'
464423
cache: true
465424
- uses: futureware-tech/simulator-action@v3
466425
with:
@@ -476,9 +435,6 @@ jobs:
476435
rendering_test_macos:
477436
name: Run Flutter macOS Rendering Tests
478437
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
479-
strategy:
480-
matrix:
481-
version: ["3.24.5"]
482438
runs-on: macos-latest
483439
timeout-minutes: 120
484440
env:
@@ -487,7 +443,7 @@ jobs:
487443
- uses: actions/checkout@v3
488444
- uses: subosito/flutter-action@v2
489445
with:
490-
flutter-version: ${{ matrix.version }}
446+
channel: 'stable'
491447
cache: true
492448
- run: flutter config --enable-macos-desktop
493449
- name: Run macos rendering test
@@ -503,9 +459,6 @@ jobs:
503459
rendering_test_windows:
504460
name: Run Flutter Windows Rendering Tests
505461
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
506-
strategy:
507-
matrix:
508-
version: ["3.24.5"]
509462
runs-on: windows-2022
510463
timeout-minutes: 120
511464
env:
@@ -514,7 +467,7 @@ jobs:
514467
- uses: actions/checkout@v3
515468
- uses: subosito/flutter-action@v2
516469
with:
517-
flutter-version: ${{ matrix.version }}
470+
channel: 'stable'
518471
cache: true
519472
- run: flutter config --enable-windows-desktop
520473
- name: Run windows integration test
@@ -532,9 +485,6 @@ jobs:
532485
rendering_test_web:
533486
name: Run Flutter Web Rendering Tests
534487
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
535-
strategy:
536-
matrix:
537-
version: ["3.24.5"]
538488
runs-on: ubuntu-latest
539489
timeout-minutes: 60
540490
env:
@@ -543,7 +493,7 @@ jobs:
543493
- uses: actions/checkout@v3
544494
- uses: subosito/flutter-action@v2
545495
with:
546-
flutter-version: ${{ matrix.version }}
496+
channel: 'stable'
547497
cache: true
548498
- name: Run web rendering test
549499
shell: bash
@@ -562,9 +512,6 @@ jobs:
562512
check_android15_16k_page_alignment:
563513
name: Check android15 16k page size alignment
564514
if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci:skip') }}
565-
strategy:
566-
matrix:
567-
version: ["3.24.5"]
568515
runs-on: ubuntu-latest
569516
steps:
570517
- uses: actions/checkout@v3
@@ -575,7 +522,7 @@ jobs:
575522
java-version: '17'
576523
- uses: subosito/flutter-action@v2
577524
with:
578-
flutter-version: ${{ matrix.version }}
525+
channel: 'stable'
579526
cache: true
580527
- run: flutter pub get
581528
- name: Run flutter build apk

‎example/android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pluginManagement {
2020
plugins {
2121
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
2222
id "com.android.application" version "8.3.0" apply false
23-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
23+
id "org.jetbrains.kotlin.android" version "1.9.10" apply false
2424
}
2525

2626
include ':app'

‎example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dev_dependencies:
4242
# activated in the `analysis_options.yaml` file located at the root of your
4343
# package. See that file for information about deactivating specific lint
4444
# rules and activating additional ones.
45-
flutter_lints: ^1.0.0
45+
flutter_lints: ^3.0.0
4646

4747
# For information on the generic Dart part of this file, see the
4848
# following page: https://dart.dev/tools/pub/pubspec

‎pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version: 6.5.2-sp.452140.b.1
66
homepage: https://www.agora.io
77
repository: https://github.com/AgoraIO-Extensions/Agora-Flutter-SDK/tree/main
88
environment:
9-
sdk: '>=2.17.0 <4.0.0'
9+
sdk: '>=2.19.0 <4.0.0'
1010
flutter: '>=3.7.0'
1111
dependencies:
1212
flutter:

0 commit comments

Comments
 (0)