Skip to content

Commit 05da225

Browse files
authored
CI Fixes (#3184)
1 parent 3a1ba4d commit 05da225

File tree

11 files changed

+52
-20
lines changed

11 files changed

+52
-20
lines changed

.github/workflows/flutter.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
build:
2929
name: '${{ matrix.target }} | ${{ matrix.os }} | ${{ matrix.sdk }}'
30-
runs-on: ${{ matrix.os }}-latest
30+
runs-on: ${{ matrix.os == 'macos' && 'macos-15' || matrix.os == 'ubuntu' && 'ubuntu-latest' || matrix.os == 'windows' && 'windows-latest' }}
3131
timeout-minutes: 30
3232
strategy:
3333
fail-fast: false
@@ -71,6 +71,11 @@ jobs:
7171
coverage: sentry_flutter
7272
min-coverage: 90
7373

74+
# QuickFix for failing iOS 18.0 builds https://github.com/actions/runner-images/issues/12758#issuecomment-3187115656
75+
- name: Switch to Xcode 16.4 for iOS 18.5
76+
if: matrix.os == 'macos'
77+
run: sudo xcode-select --switch /Applications/Xcode_16.4.app
78+
7479
- name: Build example for ${{ matrix.target }}
7580
# The example currently doesn't support compiling for WASM. Should be OK once we add package:web in v9.
7681
if: matrix.target != 'wasm'
@@ -125,6 +130,10 @@ jobs:
125130

126131
- run: flutter config --enable-swift-package-manager
127132

133+
# QuickFix for failing iOS 18.0 builds https://github.com/actions/runner-images/issues/12758#issuecomment-3187115656
134+
- name: Switch to Xcode 16.4 for iOS 18.5
135+
run: sudo xcode-select --switch /Applications/Xcode_16.4.app
136+
128137
- name: Run on iOS
129138
if: matrix.target == 'ios'
130139
run: flutter build ios --no-codesign
@@ -141,14 +150,19 @@ jobs:
141150
panaThreshold: 87
142151

143152
pod-lint:
144-
runs-on: macos-latest
153+
runs-on: macos-15
145154
timeout-minutes: 20
146155
defaults:
147156
run:
148157
working-directory: packages/flutter
149158
steps:
150159
- uses: actions/checkout@v4
151160
# https://github.com/CocoaPods/CocoaPods/issues/5275#issuecomment-315461879
161+
162+
# QuickFix for failing iOS 18.0 builds https://github.com/actions/runner-images/issues/12758#issuecomment-3187115656
163+
- name: Switch to Xcode 16.4 for iOS 18.5
164+
run: sudo xcode-select --switch /Applications/Xcode_16.4.app
165+
152166
- run: pod lib lint ios/sentry_flutter.podspec --configuration=Debug --skip-import-validation --allow-warnings --verbose
153167

154168
swift-lint:

.github/workflows/flutter_test.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105

106106
cocoa:
107107
name: '${{ matrix.target }} | ${{ matrix.sdk }}'
108-
runs-on: macos-latest-xlarge
108+
runs-on: macos-15-xlarge
109109
timeout-minutes: 30
110110
defaults:
111111
run:
@@ -129,12 +129,16 @@ jobs:
129129
- run: pod install
130130
working-directory: packages/flutter/example/${{ matrix.target }}
131131

132+
# QuickFix for failing iOS 18.0 builds https://github.com/actions/runner-images/issues/12758#issuecomment-3187115656
133+
- name: Switch to Xcode 16.4 for iOS 18.5
134+
run: sudo xcode-select --switch /Applications/Xcode_16.4.app
135+
132136
- name: prepare test device
133137
id: device
134138
run: |
135139
case "${{ matrix.target }}" in
136140
ios)
137-
device=$(xcrun simctl create sentryPhone com.apple.CoreSimulator.SimDeviceType.iPhone-16 com.apple.CoreSimulator.SimRuntime.iOS-18-0)
141+
device=$(xcrun simctl create sentryPhone com.apple.CoreSimulator.SimDeviceType.iPhone-16 com.apple.CoreSimulator.SimRuntime.iOS-18-5)
138142
xcrun simctl boot ${device}
139143
echo "platform=iOS Simulator,id=${device}" >> "$GITHUB_OUTPUT"
140144
;;

.github/workflows/metrics.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- platform: ios
3535
name: iOS
3636
appPlain: test-app-plain.ipa
37-
host: macos-latest
37+
host: macos-15
3838
- platform: android
3939
name: Android
4040
appPlain: metrics/perf-test-app-plain/build/app/outputs/apk/release/app-arm64-v8a-release.apk
@@ -71,6 +71,11 @@ jobs:
7171
path: ${{ matrix.appPlain }}
7272
key: ${{ github.workflow }}-${{ github.job }}-appplain-${{ matrix.platform }}-${{ hashFiles('metrics/perf-test-app-plain/pubspec.yaml') }}
7373

74+
# QuickFix for failing iOS 18.0 builds https://github.com/actions/runner-images/issues/12758#issuecomment-3187115656
75+
- name: Switch to Xcode 16.4
76+
if: ${{ matrix.host == 'macos-15' }}
77+
run: sudo xcode-select --switch /Applications/Xcode_16.4.app
78+
7479
- name: Build
7580
run: ./metrics/build.sh ${{ matrix.platform }}
7681
env:

.github/workflows/min_version_test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
flutter build appbundle
4646
4747
build-ios:
48-
runs-on: macos-latest
48+
runs-on: macos-15
4949
timeout-minutes: 30
5050

5151
steps:
@@ -65,6 +65,10 @@ jobs:
6565
sudo gem install cocoapods
6666
echo "$(which pod)"
6767
68+
# QuickFix for failing iOS 18.0 builds https://github.com/actions/runner-images/issues/12758#issuecomment-3187115656
69+
- name: Switch to Xcode 16.4 for iOS 18.5
70+
run: sudo xcode-select --switch /Applications/Xcode_16.4.app
71+
6872
- name: Build iOS
6973
run: |
7074
cd min_version_test

packages/flutter/example/ios/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '12.0'
2+
platform :ios, '13.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -44,7 +44,7 @@ post_install do |installer|
4444
installer.pods_project.targets.each do |target|
4545
flutter_additional_ios_build_settings(target)
4646
target.build_configurations.each do |config|
47-
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
47+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
4848
end
4949
end
5050
end

packages/flutter/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@
462462
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
463463
GCC_WARN_UNUSED_FUNCTION = YES;
464464
GCC_WARN_UNUSED_VARIABLE = YES;
465-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
465+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
466466
MTL_ENABLE_DEBUG_INFO = NO;
467467
SDKROOT = iphoneos;
468468
SUPPORTED_PLATFORMS = iphoneos;
@@ -485,7 +485,7 @@
485485
"$(PROJECT_DIR)/Flutter",
486486
);
487487
INFOPLIST_FILE = Runner/Info.plist;
488-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
488+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
489489
LD_RUNPATH_SEARCH_PATHS = (
490490
"$(inherited)",
491491
"@executable_path/Frameworks",
@@ -634,7 +634,7 @@
634634
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
635635
GCC_WARN_UNUSED_FUNCTION = YES;
636636
GCC_WARN_UNUSED_VARIABLE = YES;
637-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
637+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
638638
MTL_ENABLE_DEBUG_INFO = YES;
639639
ONLY_ACTIVE_ARCH = YES;
640640
SDKROOT = iphoneos;
@@ -684,7 +684,7 @@
684684
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
685685
GCC_WARN_UNUSED_FUNCTION = YES;
686686
GCC_WARN_UNUSED_VARIABLE = YES;
687-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
687+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
688688
MTL_ENABLE_DEBUG_INFO = NO;
689689
SDKROOT = iphoneos;
690690
SUPPORTED_PLATFORMS = iphoneos;
@@ -709,7 +709,7 @@
709709
"$(PROJECT_DIR)/Flutter",
710710
);
711711
INFOPLIST_FILE = Runner/Info.plist;
712-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
712+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
713713
LD_RUNPATH_SEARCH_PATHS = (
714714
"$(inherited)",
715715
"@executable_path/Frameworks",
@@ -742,7 +742,7 @@
742742
"$(PROJECT_DIR)/Flutter",
743743
);
744744
INFOPLIST_FILE = Runner/Info.plist;
745-
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
745+
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
746746
LD_RUNPATH_SEARCH_PATHS = (
747747
"$(inherited)",
748748
"@executable_path/Frameworks",

packages/flutter/example/macos/Podfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.14'
1+
platform :osx, '10.15'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -37,7 +37,7 @@ post_install do |installer|
3737
installer.pods_project.targets.each do |target|
3838
flutter_additional_macos_build_settings(target)
3939
target.build_configurations.each do |config|
40-
config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.14'
40+
config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.15'
4141
end
4242
end
4343
end

packages/flutter/lib/src/screenshot/screenshot.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import 'dart:async';
22
import 'dart:developer';
33
import 'dart:ui';
4+
// ignore: unnecessary_import
5+
import 'package:meta/meta.dart';
46

57
import 'package:flutter/foundation.dart';
6-
import 'package:meta/meta.dart';
78

89
@internal
910
class Screenshot {

packages/flutter/lib/src/sentry_asset_bundle.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ import 'dart:typed_data';
55
// ignore: unnecessary_import
66
import 'dart:ui';
77

8+
// ignore: unnecessary_import
9+
import 'package:meta/meta.dart';
10+
811
import 'package:flutter/foundation.dart';
912
import 'package:flutter/services.dart';
1013
import 'package:flutter/material.dart';
11-
import 'package:meta/meta.dart';
1214
import 'package:sentry/sentry.dart';
1315

1416
/// An [AssetBundle] which creates automatic performance traces for loading

packages/flutter/lib/src/utils/timer_debouncer.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import 'dart:async';
2-
import 'package:flutter/foundation.dart';
2+
// ignore: unnecessary_import
33
import 'package:meta/meta.dart';
44

5+
import 'package:flutter/foundation.dart';
6+
57
@internal
68
class TimerDebouncer {
79
final int milliseconds;

0 commit comments

Comments
 (0)