diff --git a/.github/workflows/health.yaml b/.github/workflows/health.yaml index 01ecba16..43e54e2c 100644 --- a/.github/workflows/health.yaml +++ b/.github/workflows/health.yaml @@ -93,7 +93,7 @@ on: required: false flutter_packages: description: List of packages depending on Flutter. - default: "\"\"" + default: "" required: false type: string ignore_license: diff --git a/.github/workflows/health_base.yaml b/.github/workflows/health_base.yaml index 267b8714..923f61a6 100644 --- a/.github/workflows/health_base.yaml +++ b/.github/workflows/health_base.yaml @@ -39,7 +39,7 @@ on: type: boolean required: false flutter_packages: - default: '""' + default: "" required: false type: string ignore_license: @@ -173,7 +173,7 @@ jobs: ${{ fromJSON('{"true":"--coverage_web","false":""}')[inputs.coverage_web] }} \ --fail_on ${{ inputs.fail_on }} \ --warn_on ${{ inputs.warn_on }} \ - --flutter_packages ${{ inputs.flutter_packages }} \ + --flutter_packages "${{ inputs.flutter_packages }}" \ --ignore_packages ${{ inputs.ignore_packages }} \ --ignore_license ${{ inputs.ignore_license }} \ --ignore_changelog ${{ inputs.ignore_changelog }} \ diff --git a/pkgs/corpus/lib/pub.dart b/pkgs/corpus/lib/pub.dart index 447692a4..9cd3c181 100644 --- a/pkgs/corpus/lib/pub.dart +++ b/pkgs/corpus/lib/pub.dart @@ -66,11 +66,7 @@ class Pub { for (;;) { final targetUri = uri.replace( - queryParameters: { - 'q': query, - 'page': page.toString(), - if (sort != null) 'sort': sort, - }, + queryParameters: {'q': query, 'page': page.toString(), 'sort': ?sort}, ); final map = await _getJson(targetUri); diff --git a/pkgs/firehose/CHANGELOG.md b/pkgs/firehose/CHANGELOG.md index 5dc10316..773e07af 100644 --- a/pkgs/firehose/CHANGELOG.md +++ b/pkgs/firehose/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.13.2-wip + +- Echo any error output from dependencies task on failure + (avoids silent failures). + ## 0.13.1 - Fix an issue with a nullable neededVersion diff --git a/pkgs/firehose/lib/src/health/health.dart b/pkgs/firehose/lib/src/health/health.dart index d65ec670..297a7cb9 100644 --- a/pkgs/firehose/lib/src/health/health.dart +++ b/pkgs/firehose/lib/src/health/health.dart @@ -204,7 +204,7 @@ class Health { logStdout: false, ); - final (result, _, _) = runDashProcess( + final (result, out, err) = runDashProcess( flutterPackages, package, [ @@ -219,7 +219,8 @@ class Health { if (result.exitCode != 0) { hasError = true; - final output = (result.stderr as String).replaceAll('\n', '
'); + final output = (err.trim().isNotEmpty ? err.trim() : out.trim()) + .replaceAll('\n', '
'); results.add(''' | ${package.name} |
:exclamation: Show Issues
$output
|'''); } else { diff --git a/pkgs/firehose/pubspec.yaml b/pkgs/firehose/pubspec.yaml index 412b8521..791fb16e 100644 --- a/pkgs/firehose/pubspec.yaml +++ b/pkgs/firehose/pubspec.yaml @@ -1,6 +1,6 @@ name: firehose description: A tool to automate publishing of Pub packages from GitHub actions. -version: 0.13.1 +version: 0.13.2-wip repository: https://github.com/dart-lang/ecosystem/tree/main/pkgs/firehose environment: diff --git a/pkgs/firehose/test_data/golden/comment_unused-dependencies.md b/pkgs/firehose/test_data/golden/comment_unused-dependencies.md index 0a791974..b69dd3ec 100644 --- a/pkgs/firehose/test_data/golden/comment_unused-dependencies.md +++ b/pkgs/firehose/test_data/golden/comment_unused-dependencies.md @@ -7,7 +7,7 @@ | :--- | :--- | | package1 | :heavy_check_mark: All dependencies utilized correctly. | | package2 | :heavy_check_mark: All dependencies utilized correctly. | -| package5 |
:exclamation: Show Issues
These packages may be unused, or you may be using assets from these packages:
  * lints
| +| package5 |
:exclamation: Show Issues
These packages may be unused, or you may be using assets from these packages:
  * lints
| For details on how to fix these, see [dependency_validator](https://pub.dev/packages/dependency_validator). diff --git a/pkgs/firehose/test_data/golden/comment_unused-dependencies_healthchanged.md b/pkgs/firehose/test_data/golden/comment_unused-dependencies_healthchanged.md index 28c404ce..38f4bc02 100644 --- a/pkgs/firehose/test_data/golden/comment_unused-dependencies_healthchanged.md +++ b/pkgs/firehose/test_data/golden/comment_unused-dependencies_healthchanged.md @@ -8,8 +8,8 @@ | package1 | :heavy_check_mark: All dependencies utilized correctly. | | package2 | :heavy_check_mark: All dependencies utilized correctly. | | package3 | :heavy_check_mark: All dependencies utilized correctly. | -| package4 |
:exclamation: Show Issues
These packages may be unused, or you may be using assets from these packages:
  * http
  * intl
  * lints
  * path
| -| package5 |
:exclamation: Show Issues
These packages may be unused, or you may be using assets from these packages:
  * lints
| +| package4 |
:exclamation: Show Issues
These packages may be unused, or you may be using assets from these packages:
  * http
  * intl
  * lints
  * path
| +| package5 |
:exclamation: Show Issues
These packages may be unused, or you may be using assets from these packages:
  * lints
| For details on how to fix these, see [dependency_validator](https://pub.dev/packages/dependency_validator). diff --git a/pkgs/firehose/test_data/golden/comment_unused-dependencies_ignore_package.md b/pkgs/firehose/test_data/golden/comment_unused-dependencies_ignore_package.md index 5753685b..a37f5516 100644 --- a/pkgs/firehose/test_data/golden/comment_unused-dependencies_ignore_package.md +++ b/pkgs/firehose/test_data/golden/comment_unused-dependencies_ignore_package.md @@ -6,7 +6,7 @@ | Package | Status | | :--- | :--- | | package2 | :heavy_check_mark: All dependencies utilized correctly. | -| package5 |
:exclamation: Show Issues
These packages may be unused, or you may be using assets from these packages:
  * lints
| +| package5 |
:exclamation: Show Issues
These packages may be unused, or you may be using assets from these packages:
  * lints
| For details on how to fix these, see [dependency_validator](https://pub.dev/packages/dependency_validator).