Skip to content

Commit 4413bdf

Browse files
Merge branch 'main' into fix-in_app_purchase
2 parents 84e1c95 + 546a95f commit 4413bdf

File tree

185 files changed

+6678
-80
lines changed

Some content is hidden

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

185 files changed

+6678
-80
lines changed

flutter_ci_script_beta.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ declare -a CODELABS=(
2525
"haiku_generator"
2626
"homescreen_codelab"
2727
"in_app_purchases"
28-
# TODO(domesticmouse): Add after beta is above Dart 3.7.0-0
28+
# TODO(domesticmouse): Add after beta is above Dart 3.8.0-0
2929
# "intro_flutter_gpu"
3030
"namer"
3131
"next-gen-ui"

flutter_ci_script_master.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ declare -a CODELABS=(
2525
"haiku_generator"
2626
"homescreen_codelab"
2727
"in_app_purchases"
28-
# TODO(domesticmouse): Building assets for package:flutter_scene_importer failed.
29-
# "intro_flutter_gpu"
28+
"intro_flutter_gpu"
3029
"namer"
3130
"next-gen-ui"
3231
"testing_codelab"

flutter_ci_script_shared.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ function ci_codelabs () {
5050

5151
# intro_flutter_gpu only runs with Impeller
5252
if [ $CODELAB = 'intro_flutter_gpu' ]; then
53-
if [ $RUNNER_OS = 'macOS' ] || [ $RUNNER_OS = 'Windows' ]; then
54-
flutter config --enable-native-assets
55-
flutter build `echo $RUNNER_OS | tr '[:upper:]' '[:lower:]'` --debug
56-
flutter test --enable-impeller
53+
if [ $RUNNER_OS = 'macOS' ] || [ $RUNNER_OS = 'Linux' ]; then
54+
flutter config --enable-native-assets
55+
flutter build `echo $RUNNER_OS | tr '[:upper:]' '[:lower:]'` --debug
56+
flutter test --enable-impeller
5757
else
5858
echo "Skipping $CODELAB on $RUNNER_OS"
5959
fi

intro_flutter_gpu/codelab_rebuild.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
- name: Remove generated code
66
rmdir: step_01
77
- name: Create project
8-
flutter: create --empty intro_flutter_gpu --platforms android,ios,macos,windows
8+
flutter: create --empty intro_flutter_gpu --platforms android,ios,macos,windows,linux
99
- name: Make the macOS titlebar transparent, content full window, and hide the title bar.
1010
full-screen-macos-main-menu-xib: intro_flutter_gpu/macos/Runner/Base.lproj/MainMenu.xib
1111
- name: Strip DEVELOPMENT_TEAM

0 commit comments

Comments
 (0)