Skip to content

Commit

Permalink
Merge branch 'flutter:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
ricardoamador authored Feb 13, 2024
2 parents 2cf838f + f163e34 commit a5a8fdf
Show file tree
Hide file tree
Showing 14 changed files with 94 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/scorecards-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

# Upload the results as artifacts (optional).
- name: "Upload artifact"
uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
with:
name: SARIF file
path: results.sarif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ class GithubWebhookSubscription extends SubscriptionHandler {
// Native iOS/macOS tests.
filename.contains('RunnerTests/') ||
filename.contains('RunnerUITests/') ||
filename.contains('darwin/Tests/') ||
// Native Android tests.
filename.contains('android/src/test/') ||
filename.contains('androidTest/') ||
Expand Down
1 change: 0 additions & 1 deletion app_dart/lib/src/service/firestore.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ List<Document> targetsToTaskDocuments(Commit commit, List<Target> targets) {
(Target target) => Document(
name: '$kDatabase/documents/tasks/${commit.sha}_${target.value.name}_1',
fields: <String, Value>{
'builderNumber': Value(integerValue: null),
'createTimestamp': Value(integerValue: commit.timestamp!.toString()),
'endTimestamp': Value(integerValue: '0'),
'bringup': Value(booleanValue: target.value.bringup),
Expand Down
2 changes: 1 addition & 1 deletion app_dart/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies:
http: 1.2.0
json_annotation: 4.8.1
logging: 1.2.0
meta: 1.11.0
meta: 1.12.0
mime: 1.0.5
mutex: 3.1.0
neat_cache: 2.0.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1824,6 +1824,33 @@ void foo() {
);
});

test('Packages does not comment if shared Darwin native tests', () async {
const int issueNumber = 123;

tester.message = generateGithubWebhookMessage(
action: 'opened',
number: issueNumber,
slug: Config.packagesSlug,
baseRef: Config.defaultBranch(Config.packagesSlug),
);
when(pullRequestsService.listFiles(Config.packagesSlug, issueNumber)).thenAnswer(
(_) => Stream<PullRequestFile>.fromIterable(<PullRequestFile>[
PullRequestFile()..filename = 'packages/foo/foo_foundation/darwin/Classes/SomeClass.m',
PullRequestFile()..filename = 'packages/foo/foo_foundation/darwin/Tests/SomeClassTest.m',
]),
);

await tester.post(webhook);

verifyNever(
issuesService.createComment(
Config.packagesSlug,
issueNumber,
argThat(contains(config.missingTestsPullRequestMessageValue)),
),
);
});

test('Packages does not comment if editing test files in go_router', () async {
const int issueNumber = 123;

Expand Down
1 change: 0 additions & 1 deletion app_dart/test/service/firestore_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ void main() {
final List<Document> taskDocuments = targetsToTaskDocuments(commit, targets);
expect(taskDocuments.length, 2);
expect(taskDocuments[0].name, '$kDatabase/documents/tasks/${commit.sha}_${targets[0].value.name}_1');
expect(taskDocuments[0].fields!['builderNumber']!.integerValue, null);
expect(taskDocuments[0].fields!['createTimestamp']!.integerValue, commit.timestamp.toString());
expect(taskDocuments[0].fields!['endTimestamp']!.integerValue, '0');
expect(taskDocuments[0].fields!['bringup']!.booleanValue, false);
Expand Down
2 changes: 1 addition & 1 deletion auto_submit/lib/service/revert_issue_body_formatter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class RevertIssueBodyFormatter {
RevertIssueBodyFormatter get format {
// Create the title for the revert issue.
prToRevertTitle ??= 'No title provided.';
revertPrTitle = 'Reverts "$prToRevertTitle"';
revertPrTitle = 'Reverts "$prToRevertTitle (#$prToRevertNumber)"';

// create the reverts Link for the body. Looks like Reverts flutter/cocoon#123 but will render as a link.
revertPrLink = 'Reverts ${slug.fullName}#$prToRevertNumber';
Expand Down
2 changes: 1 addition & 1 deletion auto_submit/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies:
gql: 1.0.1-alpha+1691943394579
http: 1.2.0
json_annotation: 4.8.1
meta: 1.11.0
meta: 1.12.0
neat_cache: 2.0.3
shelf: 1.4.1
shelf_router: 1.1.4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:test/test.dart';
void main() {
// Calls are made as they are done in git_cli_revert_method.dart.
test('Allow nullable fields in formatter.', () {
final PullRequest pullRequest = PullRequest(number: 123456, body: null, title: 'Interesting title.');
final PullRequest pullRequest = PullRequest(number: 54, body: null, title: 'Interesting title.');
const String sender = 'RevertAuthor';
const String reason = 'Revert reason: test xyz has began failing constantly.';
const String originalPrAuthor = 'caradune';
Expand All @@ -30,6 +30,7 @@ void main() {
);
revertIssueBodyFormatter!.format;
expect(revertIssueBodyFormatter, isNotNull);
expect(revertIssueBodyFormatter!.revertPrTitle, 'Reverts "Interesting title. (#54)"');
expect(revertIssueBodyFormatter!.revertPrBody!.contains('No description provided.'), isTrue);
expect(revertIssueBodyFormatter!.formattedRevertPrBody!.contains(originalPrAuthor), isTrue);
expect(revertIssueBodyFormatter!.formattedRevertPrBody!.contains('Mando'), isTrue);
Expand Down
2 changes: 1 addition & 1 deletion cipd_packages/codesign/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
file: 7.0.0
flutter_lints: 3.0.1
logging: 1.2.0
meta: 1.11.0
meta: 1.12.0
platform: 3.1.4
process: 5.0.2
retry: 3.1.2
2 changes: 1 addition & 1 deletion cipd_packages/device_doctor/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
analyzer: 6.4.1
args: 2.4.2
logging: 1.2.0
meta: 1.11.0
meta: 1.12.0
path: 1.9.0
process: 5.0.2
retry: 3.1.2
Expand Down
4 changes: 2 additions & 2 deletions dashboard/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ dependencies:
flutter:
sdk: flutter
collection: any # Match Flutter SDK
firebase_crashlytics: 3.4.9 # Rolled by dependabot
firebase_core: 2.25.3 # Rolled by dependabot
firebase_crashlytics: 3.4.14 # Rolled by dependabot
firebase_core: 2.25.4 # Rolled by dependabot
fixnum: 1.1.0 # Rolled by dependabot
flutter_app_icons: 0.0.9 # Rolled by dependabot
google_sign_in: 6.2.1 # Rolled by dependabot
Expand Down
110 changes: 55 additions & 55 deletions gh_actions/third_party/no-response/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion gh_actions/third_party/no-response/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@octokit/webhooks-types": "^7.3.2",
"@types/jest": "^29.5.12",
"@types/node": "^20.11.16",
"@typescript-eslint/parser": "^6.20.0",
"@typescript-eslint/parser": "^6.21.0",
"@vercel/ncc": "^0.38.1",
"eslint": "^8.56.0",
"eslint-plugin-github": "^4.10.1",
Expand Down

0 comments on commit a5a8fdf

Please sign in to comment.