Skip to content

Commit d883d62

Browse files
authored
Improve CI jobs (#1465)
1 parent 6572f8d commit d883d62

11 files changed

+61
-47
lines changed

.github/workflows/dart.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,35 +34,35 @@ jobs:
3434
os: [ubuntu-latest, windows-latest, macos-latest]
3535
sdk: [stable, beta]
3636
exclude:
37+
- os: windows-latest
38+
sdk: beta
3739
- os: macos-latest
3840
sdk: beta
3941
steps:
4042
- uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d # pin@v1
4143
with:
4244
sdk: ${{ matrix.sdk }}
4345
- uses: actions/checkout@v3
44-
# coverage with 'chrome' platform hangs the build
46+
4547
- name: Test (VM and browser)
46-
if: runner.os != 'macOS'
4748
run: |
4849
dart pub get
4950
dart test -p chrome --test-randomize-ordering-seed=random --chain-stack-traces
5051
dart test -p vm --coverage=coverage --test-randomize-ordering-seed=random --chain-stack-traces
5152
dart pub run coverage:format_coverage --lcov --in=coverage --out=coverage/lcov.info --packages=.dart_tool/package_config.json --report-on=lib
5253
5354
- name: Install webdev
55+
if: runner.os != 'Windows'
5456
run: dart pub global activate webdev
5557

5658
- name: Build example
5759
run: |
5860
cd example
5961
dart pub get
60-
dart compile exe bin/example.dart
62+
dart compile aot-snapshot bin/example.dart
6163
62-
# Windows if condition because of: The pubspec.lock file has changed since the .dart_tool/package_config.json file was generated, please run "pub get" again.
63-
# stable if condition because of: beta channel requires newer build_web_compilers and build_runner with Dart 3
6464
- name: Build Web example
65-
if: runner.os != 'Windows' && matrix.sdk == 'stable'
65+
if: runner.os != 'Windows'
6666
run: |
6767
cd example_web
6868
dart pub get

.github/workflows/dio.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@ jobs:
3434
os: [ubuntu-latest, windows-latest, macos-latest]
3535
sdk: [stable, beta]
3636
exclude:
37+
- os: windows-latest
38+
sdk: beta
3739
- os: macos-latest
3840
sdk: beta
3941
steps:
4042
- uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d # pin@v1
4143
with:
4244
sdk: ${{ matrix.sdk }}
4345
- uses: actions/checkout@v3
44-
# coverage with 'chrome' platform hangs the build
46+
4547
- name: Test (VM and browser)
4648
run: |
4749
dart pub get

.github/workflows/file.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
os: [ubuntu-latest, windows-latest, macos-latest]
35-
sdk: [stable]
35+
sdk: [stable, beta]
36+
exclude:
37+
- os: windows-latest
38+
sdk: beta
39+
- os: macos-latest
40+
sdk: beta
3641
steps:
3742
- uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d # pin@v1
3843
with:

.github/workflows/flutter.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
shell: bash
3030
strategy:
3131
fail-fast: false
32-
# max-parallel: 4
3332
matrix:
3433
os: [ubuntu-latest, windows-latest, macos-latest]
3534
target: ['ios', 'android', 'web', 'macos', 'linux', 'windows']
@@ -43,6 +42,10 @@ jobs:
4342
target: windows
4443
- os: windows-latest
4544
target: ios
45+
- os: windows-latest
46+
target: android
47+
- os: windows-latest
48+
target: web
4649
- os: windows-latest
4750
target: macos
4851
- os: windows-latest
@@ -96,7 +99,6 @@ jobs:
9699
flutter test --platform chrome --test-randomize-ordering-seed=random --tags canvasKit --web-renderer canvaskit
97100
98101
- name: Test VM with coverage
99-
if: runner.os != 'macOS'
100102
run: |
101103
cd flutter
102104
flutter test --coverage --test-randomize-ordering-seed=random

.github/workflows/flutter_integration_test.yml

+30-28
Original file line numberDiff line numberDiff line change
@@ -54,36 +54,38 @@ jobs:
5454
arch: x86_64
5555
profile: Nexus 6
5656
script: flutter test integration_test/integration_test.dart --verbose
57-
test-ios:
58-
runs-on: macos-latest
59-
timeout-minutes: 30
60-
defaults:
61-
run:
62-
working-directory: ./flutter/example
63-
strategy:
64-
fail-fast: false
65-
matrix:
66-
# 'beta' is flaky because of https://github.com/flutter/flutter/issues/124340
67-
sdk: ['stable']
68-
steps:
69-
- name: checkout
70-
uses: actions/checkout@v3
7157

72-
- uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # [email protected]
73-
with:
74-
channel: ${{ matrix.sdk }}
58+
# Enable after fixing https://github.com/getsentry/sentry-dart/issues/1448
59+
# test-ios:
60+
# runs-on: macos-latest
61+
# timeout-minutes: 30
62+
# defaults:
63+
# run:
64+
# working-directory: ./flutter/example
65+
# strategy:
66+
# fail-fast: false
67+
# matrix:
68+
# # 'beta' is flaky because of https://github.com/flutter/flutter/issues/124340
69+
# sdk: ['stable']
70+
# steps:
71+
# - name: checkout
72+
# uses: actions/checkout@v3
7573

76-
- name: flutter upgrade
77-
run: flutter upgrade
74+
# - uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # [email protected]
75+
# with:
76+
# channel: ${{ matrix.sdk }}
7877

79-
- name: flutter pub get
80-
run: flutter pub get
78+
# - name: flutter upgrade
79+
# run: flutter upgrade
8180

82-
- name: launch ios emulator
83-
uses: futureware-tech/simulator-action@ee05c113b79f056b47f354d7b313555f5491e158 #pin@v2
84-
with:
85-
model: 'iPhone 14'
86-
os_version: '16.2'
81+
# - name: flutter pub get
82+
# run: flutter pub get
83+
84+
# - name: launch ios emulator
85+
# uses: futureware-tech/simulator-action@ee05c113b79f056b47f354d7b313555f5491e158 #pin@v2
86+
# with:
87+
# model: 'iPhone 14'
88+
# os_version: '16.2'
8789

88-
- name: run ios integration test
89-
run: flutter test integration_test/integration_test.dart --verbose
90+
# - name: run ios integration test
91+
# run: flutter test integration_test/integration_test.dart --verbose

.github/workflows/logging.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,16 @@ jobs:
3434
os: [ubuntu-latest, windows-latest, macos-latest]
3535
sdk: [stable, beta]
3636
exclude:
37+
- os: windows-latest
38+
sdk: beta
3739
- os: macos-latest
3840
sdk: beta
3941
steps:
4042
- uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d # pin@v1
4143
with:
4244
sdk: ${{ matrix.sdk }}
4345
- uses: actions/checkout@v3
44-
# coverage with 'chrome' platform hangs the build
46+
4547
- name: Test (VM and browser)
4648
run: |
4749
dart pub get

.github/workflows/min_version_test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
access_token: ${{ github.token }}
2020

2121
build-android:
22-
runs-on: macos-latest
22+
runs-on: ubuntu-latest
2323
timeout-minutes: 30
2424

2525
steps:
@@ -33,7 +33,7 @@ jobs:
3333
- uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # [email protected]
3434
with:
3535
flutter-version: '3.0.0'
36-
# Add flutter build web (missing index)
36+
3737
- name: Build Android
3838
run: |
3939
cd min_version_test
@@ -50,7 +50,7 @@ jobs:
5050
- uses: subosito/flutter-action@48cafc24713cca54bbe03cdc3a423187d413aafa # [email protected]
5151
with:
5252
flutter-version: '3.0.0'
53-
# Add flutter build web (missing index)
53+
5454
- name: Build iOS
5555
run: |
5656
cd min_version_test

.github/workflows/sqflite.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ jobs:
2929
shell: bash
3030
strategy:
3131
fail-fast: false
32-
# max-parallel: 4
3332
matrix:
3433
os: [ubuntu-latest, windows-latest, macos-latest]
3534
target: ['ios', 'android', 'macos', 'linux', 'windows']
@@ -43,15 +42,15 @@ jobs:
4342
target: windows
4443
- os: windows-latest
4544
target: ios
45+
- os: windows-latest
46+
target: android
4647
- os: windows-latest
4748
target: macos
4849
- os: windows-latest
4950
target: linux
5051
# macos-latest is taking hours due to limited resources
5152
- os: macos-latest
5253
target: android
53-
- os: macos-latest
54-
target: web
5554
- os: macos-latest
5655
target: linux
5756
- os: macos-latest
@@ -89,7 +88,6 @@ jobs:
8988
flutter pub get
9089
9190
- name: Test VM with coverage
92-
if: runner.os != 'macOS'
9391
run: |
9492
cd sqflite
9593
flutter test --coverage --test-randomize-ordering-seed=random

file/pubspec.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ issue_tracker: https://github.com/getsentry/sentry-dart/issues
77
documentation: https://docs.sentry.io/platforms/dart/configuration/integrations/file/
88

99
environment:
10-
sdk: '>=2.19.0 <3.0.0'
10+
sdk: '>=2.19.0 <4.0.0'
1111

1212
dependencies:
1313
sentry: 7.6.1

flutter/example/pubspec.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies:
1616
sentry_dio:
1717
sentry_logging:
1818
sentry_sqflite:
19+
sentry_file:
1920
universal_platform: ^1.0.0
2021
feedback: ^2.0.0
2122
provider: ^6.0.0

flutter/example/pubspec_overrides.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ dependency_overrides:
99
path: ../../logging
1010
sentry_sqflite:
1111
path: ../../sqflite
12+
sentry_file:
13+
path: ../../file

0 commit comments

Comments
 (0)