Skip to content

Commit 3256203

Browse files
authored
Merge branch 'master' into web_bench_wasm
2 parents f4ed2b4 + c563216 commit 3256203

103 files changed

Lines changed: 3458 additions & 698 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/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@0057852bfaa89a56745cba8c7296529d2fc39830
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@0057852bfaa89a56745cba8c7296529d2fc39830
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@0057852bfaa89a56745cba8c7296529d2fc39830
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@0057852bfaa89a56745cba8c7296529d2fc39830
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@0057852bfaa89a56745cba8c7296529d2fc39830
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@0057852bfaa89a56745cba8c7296529d2fc39830
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@v4
189+
uses: actions/upload-artifact@v6
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@0057852bfaa89a56745cba8c7296529d2fc39830
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@v4
262+
uses: actions/upload-artifact@v6
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@0057852bfaa89a56745cba8c7296529d2fc39830
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@0057852bfaa89a56745cba8c7296529d2fc39830
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@0057852bfaa89a56745cba8c7296529d2fc39830
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@0057852bfaa89a56745cba8c7296529d2fc39830
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@0057852bfaa89a56745cba8c7296529d2fc39830
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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
.dart_tool/
55
.packages
66
.pub/
7-
pubspec.lock
7+
8+
# Exclude pubspec.lock files in tests and example fixtures.
9+
packages/devtools_app/test/**/pubspec.lock
10+
packages/devtools_extensions/example/**/pubspec.lock
811

912
.idea/
1013
.data_dir/

.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,7 @@
22
// Set current working directory to devtools_app.
33
"terminal.integrated.cwd": "packages/devtools_app",
44
"dart.showTodos": false,
5+
"dart.analysisExcludedFolders": [
6+
"tool/flutter-sdk"
7+
]
58
}

.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"label": "Start DTD on Port 8500",
66
"detail": "Starts a DTD instance running on port 8500",
77
"type": "shell",
8-
"command": "${workspaceFolder}/../tool/flutter-sdk/bin/cache/dart-sdk/bin/dart",
8+
"command": "${workspaceFolder}/tool/flutter-sdk/bin/cache/dart-sdk/bin/dart",
99
"args": [
1010
"tooling-daemon",
1111
"--disable-service-auth-codes",

0 commit comments

Comments
 (0)