Skip to content

Commit 34f6dd9

Browse files
Merge branch 'master' into precache-test-image
2 parents 023ebe2 + 05bb83a commit 34f6dd9

19 files changed

Lines changed: 542 additions & 294 deletions

File tree

‎.github/workflows/content-aware-hash.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
# test notice annotation for retrival from api
2626
echo "::notice ::{\"engine_content_hash\": \"${engine_content_hash}\"}"
2727
# test summary writing
28-
echo "{\"engine_content_hash\": \"${engine_content_hash}\"" >> $GITHUB_STEP_SUMMARY
28+
echo "{\"engine_content_hash\": \"${engine_content_hash}\"" >> "$GITHUB_STEP_SUMMARY"

‎.github/workflows/cut-release-branch.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
run: |
2727
# Use the GitHub CLI to check team membership
2828
# Returns 204 if member, 404 if not
29-
if gh api orgs/flutter/teams/flutter-release-eng/memberships/$ACTOR --silent; then
30-
echo "is_member=true" >> $GITHUB_OUTPUT
29+
if gh api "orgs/flutter/teams/flutter-release-eng/memberships/$ACTOR" --silent; then
30+
echo "is_member=true" >> "$GITHUB_OUTPUT"
3131
else
3232
echo "::error::User $ACTOR is not a member of flutter-release-eng."
3333
exit 1
@@ -71,11 +71,11 @@ jobs:
7171
env:
7272
VERSION: ${{ inputs.version }}
7373
run: |
74-
echo "BRANCH_NAME=flutter-$VERSION-candidate.0" >> $GITHUB_ENV
74+
echo "BRANCH_NAME=flutter-$VERSION-candidate.0" >> "$GITHUB_ENV"
7575
7676
- name: Check if branch already exists
7777
run: |
78-
if git ls-remote --exit-code --heads origin $BRANCH_NAME; then
78+
if git ls-remote --exit-code --heads origin "$BRANCH_NAME"; then
7979
echo "Error: Branch $BRANCH_NAME already exists on remote."
8080
exit 1
8181
fi
@@ -85,7 +85,7 @@ jobs:
8585
- name: Create Branch and Version File
8686
run: |
8787
# Create and switch to the new branch locally
88-
git checkout -b $BRANCH_NAME
88+
git checkout -b "$BRANCH_NAME"
8989
9090
# Create the version file
9191
mkdir -p bin/internal/
@@ -97,9 +97,11 @@ jobs:
9797
9898
- name: Push new branch
9999
run: |
100-
git push origin $BRANCH_NAME
101-
echo "## Release Branch \`$BRANCH_NAME\` Cut Successfully" >> $GITHUB_STEP_SUMMARY
102-
echo "" >> $GITHUB_STEP_SUMMARY
103-
echo "🔗 **View Branch** https://github.com/$GITHUB_REPOSITORY/tree/$BRANCH_NAME" >> $GITHUB_STEP_SUMMARY
100+
git push origin "$BRANCH_NAME"
101+
{
102+
echo "## Release Branch \`$BRANCH_NAME\` Cut Successfully"
103+
echo ""
104+
echo "🔗 **View Branch** https://github.com/$GITHUB_REPOSITORY/tree/$BRANCH_NAME"
105+
} >> "$GITHUB_STEP_SUMMARY"
104106
env:
105107
GH_TOKEN: ${{ secrets.FLUTTERACTIONSBOT_CP_TOKEN }}

‎.github/workflows/easy-cp.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
steps:
4343
- name: Remove Label and Leave Comment
4444
run: |
45-
gh issue edit $ISSUE_NUMBER -R flutter/flutter --remove-label "$LABEL_NAME"
46-
gh issue comment $ISSUE_NUMBER -R flutter/flutter -b "Cherry-pick labels should only be applied to merged pull requests."
45+
gh issue edit "$ISSUE_NUMBER" -R flutter/flutter --remove-label "$LABEL_NAME"
46+
gh issue comment "$ISSUE_NUMBER" -R flutter/flutter -b "Cherry-pick labels should only be applied to merged pull requests."
4747
env:
4848
GH_TOKEN: ${{ secrets.FLUTTERACTIONSBOT_CP_TOKEN }}
4949
LABEL_NAME: ${{ github.event.label.name }}
@@ -61,7 +61,7 @@ jobs:
6161
id: get-channel
6262
env:
6363
LABEL_NAME: ${{ github.event.label.name }}
64-
run: echo "channel=$(echo $LABEL_NAME | cut -d ':' -f 2 | xargs)" >> "$GITHUB_OUTPUT"
64+
run: echo "channel=$(echo "$LABEL_NAME" | cut -d ':' -f 2 | xargs)" >> "$GITHUB_OUTPUT"
6565

6666
- name: Export Release Candidate Branch
6767
id: get-branch

‎.github/workflows/merge-changelog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
run: |
7474
gh pr create \
7575
--base master \
76-
--head flutteractionsbot:$PR_BRANCH_NAME \
76+
--head "flutteractionsbot:$PR_BRANCH_NAME" \
7777
--repo flutter/flutter \
7878
--title "Sync CHANGELOG.md from stable" \
7979
--body "This PR automates the synchronization of \`CHANGELOG.md\` from the \`stable\` branch to the \`master\` branch." \

‎.github/workflows/roll-dart-dependencies.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ jobs:
3535
- name: Fetch upstream
3636
run: |
3737
git remote add upstream https://github.com/flutter/flutter.git
38-
git fetch upstream $REF_NAME
38+
git fetch upstream "$REF_NAME"
3939
4040
BRANCH_NAME="sync-dart-$DART_HASH"
41-
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
41+
echo "BRANCH_NAME=$BRANCH_NAME" >> "$GITHUB_ENV"
4242
43-
git checkout -b "$BRANCH_NAME" upstream/$REF_NAME
43+
git checkout -b "$BRANCH_NAME" "upstream/$REF_NAME"
4444
env:
4545
GH_TOKEN: ${{ secrets.FLUTTERACTIONSBOT_CP_TOKEN }}
4646
REF_NAME: ${{ github.ref_name }}
@@ -54,9 +54,7 @@ jobs:
5454
echo "Fetching DEPS from $URL"
5555
5656
# Googlesource returns base64 encoded text when format=TEXT is used
57-
RESPONSE=$(curl -s -f "$URL")
58-
59-
if [ $? -ne 0 ]; then
57+
if ! RESPONSE=$(curl -s -f "$URL"); then
6058
echo "::error::Failed to download DEPS file. Please verify the Dart hash: $DART_HASH"
6159
exit 1
6260
fi
@@ -99,11 +97,11 @@ jobs:
9997
run: |
10098
# Check if the root DEPS file has changed
10199
if git diff --exit-code DEPS; then
102-
echo "changed=false" >> $GITHUB_OUTPUT
103-
echo "## ✅ Dart version already up to date" >> $GITHUB_STEP_SUMMARY
104-
echo "The DEPS file is already up to date with Dart hash \`$DART_HASH\`." >> $GITHUB_STEP_SUMMARY
100+
echo "changed=false" >> "$GITHUB_OUTPUT"
101+
echo "## ✅ Dart version already up to date" >> "$GITHUB_STEP_SUMMARY"
102+
echo "The DEPS file is already up to date with Dart hash \`$DART_HASH\`." >> "$GITHUB_STEP_SUMMARY"
105103
else
106-
echo "changed=true" >> $GITHUB_OUTPUT
104+
echo "changed=true" >> "$GITHUB_OUTPUT"
107105
fi
108106
109107
- name: Create PR if Changed
@@ -118,14 +116,16 @@ jobs:
118116
--title "[$REF_NAME] Update Flutter DEPS to Dart $DART_HASH" \
119117
--body "This PR updates the transitive dependencies in the engine \`DEPS\` file based on Dart SDK hash \`$DART_HASH\`." \
120118
--repo flutter/flutter \
121-
--base $REF_NAME \
122-
--head flutteractionsbot:$BRANCH_NAME)
119+
--base "$REF_NAME" \
120+
--head "flutteractionsbot:$BRANCH_NAME")
123121
124122
# Nice big PR Success Summary
125-
echo "## 🚀 PR Created Successfully" >> $GITHUB_STEP_SUMMARY
126-
echo "Updated dart dependencies to \`$DART_HASH\`." >> $GITHUB_STEP_SUMMARY
127-
echo "" >> $GITHUB_STEP_SUMMARY
128-
echo "🔗 **View Pull Request:** $PR_URL" >> $GITHUB_STEP_SUMMARY
123+
{
124+
echo "## 🚀 PR Created Successfully"
125+
echo "Updated dart dependencies to \`$DART_HASH\`."
126+
echo ""
127+
echo "🔗 **View Pull Request:** $PR_URL"
128+
} >> "$GITHUB_STEP_SUMMARY"
129129
env:
130130
GH_TOKEN: ${{ secrets.FLUTTERACTIONSBOT_CP_TOKEN }}
131131
DART_HASH: ${{ inputs.dart_hash }}

‎.github/workflows/sync-engine-version.yml‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
- name: Fetch upstream
3131
run: |
3232
git remote add upstream https://github.com/flutter/flutter.git
33-
git fetch upstream $REF_NAME
33+
git fetch upstream "$REF_NAME"
3434
3535
BRANCH_NAME="update-engine-$(date +%s)"
36-
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
36+
echo "BRANCH_NAME=$BRANCH_NAME" >> "$GITHUB_ENV"
3737
38-
git checkout -b "$BRANCH_NAME" upstream/$REF_NAME
38+
git checkout -b "$BRANCH_NAME" "upstream/$REF_NAME"
3939
env:
4040
GH_TOKEN: ${{ secrets.FLUTTERACTIONSBOT_CP_TOKEN }}
4141
REF_NAME: ${{ github.ref_name }}
@@ -49,13 +49,13 @@ jobs:
4949
else
5050
OLD_HASH="None (New File)"
5151
fi
52-
echo "OLD_HASH=$OLD_HASH" >> $GITHUB_ENV
52+
echo "OLD_HASH=$OLD_HASH" >> "$GITHUB_ENV"
5353
5454
chmod +x bin/internal/last_engine_commit.sh
5555
NEW_HASH=$(./bin/internal/last_engine_commit.sh)
5656
5757
echo "$NEW_HASH" > bin/internal/engine.version
58-
echo "ENGINE_HASH=$NEW_HASH" >> $GITHUB_ENV
58+
echo "ENGINE_HASH=$NEW_HASH" >> "$GITHUB_ENV"
5959
6060
- name: Check for Changes
6161
id: git-check
@@ -64,13 +64,13 @@ jobs:
6464
git add -f bin/internal/engine.version
6565
6666
if git diff --cached --exit-code bin/internal/engine.version; then
67-
echo "changed=false" >> $GITHUB_OUTPUT
67+
echo "changed=false" >> "$GITHUB_OUTPUT"
6868
6969
# Nice big No-Op Summary
70-
echo "## ✅ Engine version already up to date" >> $GITHUB_STEP_SUMMARY
71-
echo "The engine is already at hash \`$ENGINE_HASH\`. No PR was created." >> $GITHUB_STEP_SUMMARY
70+
echo "## ✅ Engine version already up to date" >> "$GITHUB_STEP_SUMMARY"
71+
echo "The engine is already at hash \`$ENGINE_HASH\`. No PR was created." >> "$GITHUB_STEP_SUMMARY"
7272
else
73-
echo "changed=true" >> $GITHUB_OUTPUT
73+
echo "changed=true" >> "$GITHUB_OUTPUT"
7474
fi
7575
7676
- name: Create PR if Changed
@@ -85,14 +85,16 @@ jobs:
8585
--title "[$REF_NAME] Sync engine.version to $ENGINE_HASH" \
8686
--body "Updates the engine.version file from \`$OLD_HASH\` to \`$ENGINE_HASH\`." \
8787
--repo flutter/flutter \
88-
--base $REF_NAME \
89-
--head flutteractionsbot:$BRANCH_NAME)
88+
--base "$REF_NAME" \
89+
--head "flutteractionsbot:$BRANCH_NAME")
9090
9191
# Nice big PR Success Summary
92-
echo "## 🚀 PR Created Successfully" >> $GITHUB_STEP_SUMMARY
93-
echo "Updated engine version from \`$OLD_HASH\` to \`$ENGINE_HASH\`." >> $GITHUB_STEP_SUMMARY
94-
echo "" >> $GITHUB_STEP_SUMMARY
95-
echo "🔗 **View Pull Request:** $PR_URL" >> $GITHUB_STEP_SUMMARY
92+
{
93+
echo "## 🚀 PR Created Successfully"
94+
echo "Updated engine version from \`$OLD_HASH\` to \`$ENGINE_HASH\`."
95+
echo ""
96+
echo "🔗 **View Pull Request:** $PR_URL"
97+
} >> "$GITHUB_STEP_SUMMARY"
9698
env:
9799
GH_TOKEN: ${{ secrets.FLUTTERACTIONSBOT_CP_TOKEN }}
98100
REF_NAME: ${{ github.ref_name }}

‎dev/bots/docs.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ function generate_docs() {
121121
# Install and activate dartdoc.
122122
# When updating to a new dartdoc version, please also update
123123
# `dartdoc_options.yaml` to include newly introduced error and warning types.
124-
"$DART" pub global activate dartdoc 9.0.6
124+
"$DART" pub global activate dartdoc 9.0.8
125125

126126
# Build and install the snippets tool, which resides in
127127
# the dev/docs/snippets directory.

‎engine/src/flutter/shell/platform/linux/fl_view_renderer_opengl.cc‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,15 @@ static gboolean fl_view_renderer_opengl_draw(GtkWidget* widget, cairo_t* cr) {
162162
wait_for_frame(self, window, scale_factor);
163163
}
164164

165+
// The frame is drawn from an OpenGL texture, so make a context current that
166+
// can access it. This is deliberately not cleared once the frame is drawn -
167+
// GTK makes the context it needs current before using OpenGL but doesn't
168+
// check that this succeeded, and then uses whatever context is current. If
169+
// that is nothing it dereferences NULL and crashes.
170+
//
171+
// Leaving this context current gives GTK one to fall back on. It is created
172+
// on the same window and shares with the context GTK would have used itself,
173+
// so GTK can safely draw with it.
165174
if (self->render_context != nullptr) {
166175
gdk_gl_context_make_current(self->render_context);
167176
}
@@ -174,10 +183,6 @@ static gboolean fl_view_renderer_opengl_draw(GtkWidget* widget, cairo_t* cr) {
174183
height);
175184
}
176185

177-
if (self->render_context != nullptr) {
178-
gdk_gl_context_clear_current();
179-
}
180-
181186
g_mutex_unlock(&self->frame_mutex);
182187

183188
return result;

‎packages/flutter/test/material/dropdown_test.dart‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
// no-shuffle:
6-
// //TODO(gspencergoog): Remove this tag once this test's state leaks/test
7-
// dependencies have been fixed.
8-
// https://github.com/flutter/flutter/issues/85160
9-
// Fails with "flutter test --test-randomize-ordering-seed=456"
105
// reduced-test-set:
116
// This file is run as part of a reduced test set in CI on Mac and Windows
127
// machines.
13-
@Tags(<String>['reduced-test-set', 'no-shuffle'])
8+
@Tags(<String>['reduced-test-set'])
149
library;
1510

1611
import 'dart:math' as math;
@@ -4166,36 +4161,34 @@ void main() {
41664161
);
41674162
});
41684163

4169-
testWidgets(
4170-
'Conflicting scrollbars are not applied by ScrollBehavior to Dropdown',
4171-
(WidgetTester tester) async {
4172-
// Regression test for https://github.com/flutter/flutter/issues/83819
4173-
// Open the dropdown menu
4174-
final Key buttonKey = UniqueKey();
4175-
await tester.pumpWidget(
4176-
buildFrame(
4177-
buttonKey: buttonKey,
4178-
initialValue: null, // nothing selected
4179-
items: List<String>.generate(100, (int index) => index.toString()),
4180-
onChanged: onChanged,
4181-
),
4182-
);
4183-
await tester.tap(find.byKey(buttonKey));
4184-
await tester.pump();
4185-
await tester.pumpAndSettle(); // finish the menu animation
4164+
testWidgets('Conflicting scrollbars are not applied by ScrollBehavior to Dropdown', (
4165+
WidgetTester tester,
4166+
) async {
4167+
// Regression test for https://github.com/flutter/flutter/issues/83819
4168+
// Open the dropdown menu
4169+
final Key buttonKey = UniqueKey();
4170+
await tester.pumpWidget(
4171+
buildFrame(
4172+
buttonKey: buttonKey,
4173+
initialValue: null, // nothing selected
4174+
items: List<String>.generate(100, (int index) => index.toString()),
4175+
onChanged: onChanged,
4176+
),
4177+
);
4178+
await tester.tap(find.byKey(buttonKey));
4179+
await tester.pump();
4180+
await tester.pumpAndSettle(); // finish the menu animation
41864181

4187-
// The inherited ScrollBehavior should not apply Scrollbars since they are
4188-
// already built in to the widget. For iOS platform, ScrollBar directly returns
4189-
// CupertinoScrollbar
4190-
expect(
4191-
find.byType(CupertinoScrollbar),
4192-
debugDefaultTargetPlatformOverride == TargetPlatform.iOS ? findsOneWidget : findsNothing,
4193-
);
4194-
expect(find.byType(Scrollbar), findsOneWidget);
4195-
expect(find.byType(RawScrollbar), findsNothing);
4196-
},
4197-
variant: TargetPlatformVariant.all(),
4198-
);
4182+
// The inherited ScrollBehavior should not apply Scrollbars since they are
4183+
// already built in to the widget. For iOS platform, ScrollBar directly returns
4184+
// CupertinoScrollbar
4185+
expect(
4186+
find.byType(CupertinoScrollbar),
4187+
debugDefaultTargetPlatformOverride == TargetPlatform.iOS ? findsOneWidget : findsNothing,
4188+
);
4189+
expect(find.byType(Scrollbar), findsOneWidget);
4190+
expect(find.byType(RawScrollbar), findsNothing);
4191+
}, variant: TargetPlatformVariant.all());
41994192

42004193
testWidgets('borderRadius property works properly', (WidgetTester tester) async {
42014194
const radius = 20.0;

0 commit comments

Comments
 (0)