Skip to content

Commit 4c14098

Browse files
authored
Merge branch 'master' into 2.54.2
2 parents 9be2c88 + 81be774 commit 4c14098

77 files changed

Lines changed: 1608 additions & 467 deletions

File tree

Some content is hidden

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

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,46 @@
1-
*Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.*
2-
31
*List which issues are fixed by this PR.*
42

5-
*Please add a note to `packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md` if your change requires release notes. Otherwise, add the 'release-notes-not-required' label to the PR.*
3+
*Replace this paragraph with a description of what this PR is changing or adding, and why. If your PR is updating any UI functionality, please include include before/after screenshots and/or a gif of the UI interaction.*
64

75
## Pre-launch Checklist
86

7+
### General checklist
8+
99
- [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
1010
- [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities.
1111
- [ ] I read the [Flutter Style Guide] _recently_, and have followed its advice.
1212
- [ ] I signed the [CLA].
13-
- [ ] I listed at least one issue that this PR fixes in the description above.
1413
- [ ] I updated/added relevant documentation (doc comments with `///`).
15-
- [ ] I added new tests to check the change I am making, or there is a reason for not adding tests.
1614

15+
### Issues checklist
16+
17+
- [ ] I listed at least one issue that this PR fixes in the description above.
18+
- [ ] I listed at least one issue which has the [`contributions-welcome`] or [`good-first-issue`] label.
19+
- [ ] I did not list at least one issue with the [`contributions-welcome`] or [`good-first-issue`] label. I understand this means my PR might take longer to be reviewed.
20+
21+
### Tests checklist
22+
23+
- [ ] I added new tests to check the change I am making...
24+
- [ ] OR there is a reason for not adding tests, which I explained in the PR description.
25+
26+
### AI-tooling checklist
27+
28+
- [ ] I did not use any AI tooling in creating this PR.
29+
- [ ] OR I did use AI tooling, and...
30+
* [ ] I read the [AI contributions guidelines] and agree to follow them.
31+
* [ ] I reviewed all AI-generated code before opening this PR.
32+
* [ ] I understand and am able to discuss the code in this PR.
33+
* [ ] I have verifed the accuracy of any AI-generated text included in the PR description.
34+
* [ ] I commit to verifying the accuracy of any AI-generated code or text that I upload in response to review comments.
35+
36+
### Feature-change checklist
37+
38+
- [ ] This PR does not change the DevTools UI or behavior and...
39+
* [ ] I added the `release-notes-not-required` label or left a comment requesting the label be added.
40+
- [ ] OR this PR does change the DevTools UI or behavior and...
41+
* [ ] I added an entry to `packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md`.
42+
* [ ] I included before/after screenshots and/or a GIF demo of the new UI to my PR description.
43+
* [ ] I ran the DevTools app locally to manually verify my changes.
1744

1845
![build.yaml badge]
1946

@@ -24,5 +51,8 @@ If you need help, consider asking for help on [Discord].
2451
[Tree Hygiene]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md
2552
[Flutter Style Guide]: https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md
2653
[CLA]: https://cla.developers.google.com/
27-
[Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
54+
[`contributions-welcome`]: https://github.com/flutter/devtools/issues?q=state%3Aopen%20label%3Acontributions-welcome
55+
[`good-first-issue`]: https://github.com/flutter/devtools/issues?q=state%3Aopen%20label%3Agood-first-issue
56+
[AI contributions guideline]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#ai-contribution-guidelines
2857
[build.yaml badge]: https://github.com/flutter/devtools/actions/workflows/build.yaml/badge.svg
58+
[Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md

.github/workflows/build.yaml

Lines changed: 49 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
os: [ubuntu-latest, windows-latest]
3737
steps:
3838
- name: git clone
39-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
39+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
4040
- name: Load Cached Flutter SDK
41-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
41+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
4242
with:
4343
path: |
4444
./tool/flutter-sdk
@@ -57,11 +57,11 @@ jobs:
5757
fail-fast: false
5858
steps:
5959
- name: Clone Flutter DevTools
60-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
60+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
6161
with:
6262
ref: "${{ github.event.pull_request.head.sha }}"
6363
- name: Load Cached Flutter SDK
64-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
64+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
6565
with:
6666
path: |
6767
./tool/flutter-sdk
@@ -97,9 +97,9 @@ jobs:
9797
os: [ubuntu-latest, windows-latest]
9898
steps:
9999
- name: git clone
100-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
100+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
101101
- name: Load Cached Flutter SDK
102-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
102+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
103103
with:
104104
path: |
105105
./tool/flutter-sdk
@@ -119,9 +119,9 @@ jobs:
119119
os: [ubuntu-latest, windows-latest]
120120
steps:
121121
- name: git clone
122-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
122+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
123123
- name: Load Cached Flutter SDK
124-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
124+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
125125
with:
126126
path: |
127127
./tool/flutter-sdk
@@ -144,9 +144,9 @@ jobs:
144144
os: [ubuntu-latest, windows-latest]
145145
steps:
146146
- name: git clone
147-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
147+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
148148
- name: Load Cached Flutter SDK
149-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
149+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
150150
with:
151151
path: |
152152
./tool/flutter-sdk
@@ -171,9 +171,9 @@ jobs:
171171

172172
steps:
173173
- name: git clone
174-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
174+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
175175
- name: Load Cached Flutter SDK
176-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
176+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
177177
with:
178178
path: |
179179
./tool/flutter-sdk
@@ -186,7 +186,7 @@ jobs:
186186
run: ./tool/ci/bots.sh
187187

188188
- name: Upload Golden Failure Artifacts
189-
uses: actions/upload-artifact@v6
189+
uses: actions/upload-artifact@v7
190190
if: failure()
191191
with:
192192
name: golden_image_failures.${{ matrix.bot }}
@@ -243,9 +243,9 @@ jobs:
243243
shard: 3/3
244244
steps:
245245
- name: git clone
246-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
246+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
247247
- name: Load Cached Flutter SDK
248-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
248+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
249249
with:
250250
path: |
251251
./tool/flutter-sdk
@@ -259,7 +259,7 @@ jobs:
259259
run: ./tool/ci/bots.sh
260260

261261
- name: Upload Golden Failure Artifacts
262-
uses: actions/upload-artifact@v6
262+
uses: actions/upload-artifact@v7
263263
if: failure()
264264
with:
265265
name: golden_image_failures.${{ matrix.bot }}
@@ -277,9 +277,9 @@ jobs:
277277
os: [ubuntu-latest, windows-latest]
278278
steps:
279279
- name: git clone
280-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
280+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
281281
- name: Load Cached Flutter SDK
282-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
282+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
283283
with:
284284
path: |
285285
./tool/flutter-sdk
@@ -290,6 +290,31 @@ jobs:
290290
DEVTOOLS_PACKAGE: devtools_extensions
291291
run: ./tool/ci/bots.sh
292292

293+
devtools-webdriver-test:
294+
name: ${{ matrix.os }} devtools webdriver test
295+
needs: flutter-prep
296+
runs-on: ${{ matrix.os }}
297+
strategy:
298+
fail-fast: false
299+
matrix:
300+
bot:
301+
- test_webdriver
302+
os: [ubuntu-latest, windows-latest]
303+
steps:
304+
- name: git clone
305+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
306+
- name: Load Cached Flutter SDK
307+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
308+
with:
309+
path: |
310+
./tool/flutter-sdk
311+
key: flutter-sdk-${{ runner.os }}-${{ needs.flutter-prep.outputs.latest_flutter_candidate }}
312+
- name: tool/ci/bots.sh
313+
env:
314+
BOT: ${{ matrix.bot }}
315+
PLATFORM: vm
316+
run: ./tool/ci/bots.sh
317+
293318
benchmark-performance:
294319
name: benchmark-performance
295320
needs: flutter-prep
@@ -298,9 +323,9 @@ jobs:
298323
fail-fast: false
299324
steps:
300325
- name: git clone
301-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
326+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
302327
- name: Load Cached Flutter SDK
303-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
328+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
304329
with:
305330
path: |
306331
./tool/flutter-sdk
@@ -316,9 +341,9 @@ jobs:
316341
fail-fast: false
317342
steps:
318343
- name: git clone
319-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
344+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
320345
- name: Load Cached Flutter SDK
321-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
346+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
322347
with:
323348
path: |
324349
./tool/flutter-sdk
@@ -339,7 +364,7 @@ jobs:
339364
# - test_dart2js
340365
# steps:
341366
# - name: git clone
342-
# uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
367+
# uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
343368
#
344369
# - name: tool/ci/bots.sh
345370
# env:
@@ -359,7 +384,7 @@ jobs:
359384
# - integration_dart2js
360385
# steps:
361386
# - name: git clone
362-
# uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
387+
# uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
363388
# - name: tool/ci/bots.sh
364389
# env:
365390
# BOT: ${{ matrix.bot }}

.github/workflows/daily-dev-bump.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
runs-on: ubuntu-latest
3838
steps:
3939
- name: git clone devtools
40-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
40+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
4141
with:
4242
ref: master
4343

4444
- name: Load Cached Flutter SDK
45-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
45+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
4646
with:
4747
path: |
4848
./tool/flutter-sdk

.github/workflows/flutter-candidate-update.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: git clone devtools
24-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
24+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
2525
with:
2626
ref: master
2727

.github/workflows/flutter-prep.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# TODO(https://github.com/flutter/devtools/issues/5729) Consider caching DevTools so that we
3636
# don't check it out again is subsequent workflows.
3737
- name: Checkout DevTools (default)
38-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
38+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
3939

4040
- name: Get Latest Flutter Candidate
4141
id: flutter-candidate
@@ -45,7 +45,7 @@ jobs:
4545
4646
- name: Load Cached Flutter SDK
4747
id: cache-flutter
48-
uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0
48+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7
4949
with:
5050
path: |
5151
./tool/flutter-sdk

.github/workflows/health.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Health
2+
on:
3+
pull_request:
4+
branches: [ master ]
5+
types: [opened, synchronize, reopened, labeled, unlabeled]
6+
jobs:
7+
health:
8+
uses: dart-lang/ecosystem/.github/workflows/health.yaml@main
9+
with:
10+
checks: "version,changelog,breaking,do-not-submit,leaking"
11+
fail_on: "do-not-submit"
12+
warn_on: "version,changelog,breaking,leaking"
13+
use-flutter: true
14+
permissions:
15+
pull-requests: write
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Comment on the pull request
2+
3+
on:
4+
# Trigger this workflow after the Health workflow completes. This workflow will have permissions to
5+
# do things like create comments on the PR, even if the original workflow couldn't.
6+
workflow_run:
7+
workflows:
8+
- Health
9+
types:
10+
- completed
11+
12+
jobs:
13+
upload:
14+
uses: dart-lang/ecosystem/.github/workflows/post_summaries.yaml@main
15+
permissions:
16+
pull-requests: write

.github/workflows/workflow-bot-cleanup.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Sparse checkout of the repository
19-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
2020
with:
2121
sparse-checkout: |
2222
README.md

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# Exclude pubspec.lock files in tests and example fixtures.
99
packages/devtools_app/test/**/pubspec.lock
1010
packages/devtools_extensions/example/**/pubspec.lock
11+
third_party/**/pubspec.lock
1112

1213
.idea/
1314
.data_dir/

CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ We gladly accept contributions via GitHub pull requests! We encourage you to rea
2222
framework's contributing guide, as all of that information applies to contributing to the `flutter/devtools`
2323
repo as well.
2424

25+
We prioritize reviewing PRs that address issues with the following labels:
26+
* [`good-first-issue`](https://github.com/flutter/devtools/issues?q=state%3Aopen%20label%3Agood-first-issue): Small and easy issues that can be tackled by a first-time contributor.
27+
* [`contributions-welcome`](https://github.com/flutter/devtools/issues?q=state%3Aopen%20label%3Acontributions-welcome): Issues of any size or difficulty that we consider high-priority fixes.
28+
2529
We communicate primarily over GitHub and [Discord](https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md) on the
2630
[#hackers-devtools](https://discord.com/channels/608014603317936148/1106667330093723668) channel.
2731

0 commit comments

Comments
 (0)