Skip to content

Commit

Permalink
Merge branch 'main' into reland_ui_web_analyze
Browse files Browse the repository at this point in the history
  • Loading branch information
eyebrowsoffire committed Apr 4, 2023
2 parents 40cd4da + 37ea80f commit 9be83ee
Show file tree
Hide file tree
Showing 159 changed files with 3,943 additions and 2,766 deletions.
2 changes: 1 addition & 1 deletion .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ targets:
{"download_emsdk": true}
dependencies: >-
[
{"dependency": "chrome_and_driver", "version": "version:111.0"},
{"dependency": "chrome_and_driver", "version": "version:111.0a"},
{"dependency": "curl", "version": "version:7.64.0"}
]
framework: "true"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
with:
persist-credentials: false
- name: "Run analysis"
uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86
uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -65,6 +65,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@67a35a08586135a9573f4327e904ecbf517a882d
uses: github/codeql-action/upload-sarif@04df1262e6247151b5ac09cd2c303ac36ad3f62b
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/third_party_scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@67a35a08586135a9573f4327e904ecbf517a882d
uses: github/codeql-action/upload-sarif@04df1262e6247151b5ac09cd2c303ac36ad3f62b
with:
sarif_file: osvReport.sarif
6 changes: 3 additions & 3 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ vars = {
'llvm_git': 'https://llvm.googlesource.com',
# OCMock is for testing only so there is no google clone
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
'skia_revision': '4d1e9cabf0c8c9d71f5749a2473b2ee5dee692b5',
'skia_revision': 'ad459a5b8df474d881209696b3fb4f038e0d3a55',

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down Expand Up @@ -48,7 +48,7 @@ vars = {
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
# You can use //tools/dart/create_updated_flutter_deps.py to produce
# updated revision list of existing dependencies.
'dart_revision': '7e36e11608f300211ccabbdc7eee2b4788a5c174',
'dart_revision': 'f08901c71710db0df616d29a969a3aa15f1b92a9',

# WARNING: DO NOT EDIT MANUALLY
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
Expand Down Expand Up @@ -455,7 +455,7 @@ deps = {
Var('dart_git') + '/test_reflective_loader.git@c4c2d5c3f94a96f3fc79e9e28944fba391bc544c',

'src/third_party/dart/third_party/pkg/tools':
Var('dart_git') + '/tools.git@9ce9f67c3ff2ac835ed0045e71d22188e2a19562',
Var('dart_git') + '/tools.git@fb2dada0f453a300659e6a2524fdcaed16056235',

'src/third_party/dart/third_party/pkg/typed_data':
Var('dart_git') + '/typed_data.git@f858046fb420cf644e7d8cb86b7893f2830d8a6c',
Expand Down

0 comments on commit 9be83ee

Please sign in to comment.