[infra] Try uploading combined coverage (#2328)

dcharkes · web-flow · commit 0028dd6d363b · 2025-05-26T13:25:36.000+02:00
diff --git a/.github/workflows/ffigen.yml b/.github/workflows/ffigen.yml
@@ -104,7 +104,7 @@ jobs:
       - name: Upload coverage
         uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b
         with:
-          carryforward: "ffigen,jni,jnigen,native_assets_builder_macos,native_assets_builder_ubuntu,native_assets_builder_windows,native_assets_cli_macos,native_assets_cli_ubuntu,native_assets_cli_windows,native_toolchain_c_macos,native_toolchain_c_ubuntu,native_toolchain_c_windows,objective_c,swift2objc"
+          carryforward: "ffigen,jni,jnigen,native_pkgs_macos,native_pkgs_ubuntu,native_pkgs_windows,objective_c,swift2objc"
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
 
diff --git a/.github/workflows/jnigen.yaml b/.github/workflows/jnigen.yaml
@@ -447,6 +447,6 @@ jobs:
       - name: Coveralls finished
         uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b
         with:
-          carryforward: "ffigen,jni,jnigen,native_assets_builder_macos,native_assets_builder_ubuntu,native_assets_builder_windows,native_assets_cli_macos,native_assets_cli_ubuntu,native_assets_cli_windows,native_toolchain_c_macos,native_toolchain_c_ubuntu,native_toolchain_c_windows,objective_c,swift2objc"
+          carryforward: "ffigen,jni,jnigen,native_pkgs_macos,native_pkgs_ubuntu,native_pkgs_windows,objective_c,swift2objc"
           github-token: ${{ secrets.github_token }}
           parallel-finished: true
diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml
@@ -40,19 +40,12 @@ jobs:
       matrix:
         os: [ubuntu, macos, windows]
         sdk: [dev]
-        package:
-          # TODO(https://github.com/dart-lang/tools/issues/2083): Remove running coverage per package.
-          - code_assets # currently dubs as place where all packages are run
-          - data_assets
-          - hooks
-          - hooks_runner
-          - native_toolchain_c
 
     runs-on: ${{ matrix.os }}-latest
 
     defaults:
       run:
-        working-directory: pkgs/${{ matrix.package }}
+        working-directory: .
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -73,21 +66,12 @@ jobs:
       - run: dart pub get
 
       - name: Run pub get, analysis, formatting, generators, tests, and examples.
-        run: dart tool/ci.dart --pub
-        working-directory: .
-        if: ${{ matrix.package == 'code_assets' }}
-
-      # TODO(https://github.com/dart-lang/tools/issues/2083): Remove running coverage per package.
-      - name: Install coverage
-        run: dart pub global activate coverage
-
-      - name: Collect coverage
-        run: dart pub global run coverage:test_with_coverage
+        run: dart tool/ci.dart --pub --coverage
 
       - name: Upload coverage
         uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b
         with:
-          flag-name: ${{ matrix.package }}_${{ matrix.os }}
+          flag-name: native_pkgs_${{ matrix.os }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel: true
 
@@ -98,6 +82,6 @@ jobs:
       - name: Upload coverage
         uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b
         with:
-          carryforward: "ffigen,jni,jnigen,native_assets_builder_macos,native_assets_builder_ubuntu,native_assets_builder_windows,native_assets_cli_macos,native_assets_cli_ubuntu,native_assets_cli_windows,native_toolchain_c_macos,native_toolchain_c_ubuntu,native_toolchain_c_windows,objective_c,swift2objc"
+          carryforward: "ffigen,jni,jnigen,native_pkgs_macos,native_pkgs_ubuntu,native_pkgs_windows,objective_c,swift2objc"
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
diff --git a/.github/workflows/objective_c.yaml b/.github/workflows/objective_c.yaml
@@ -76,7 +76,7 @@ jobs:
       - name: Upload coverage
         uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b
         with:
-          carryforward: "ffigen,jni,jnigen,native_assets_builder_macos,native_assets_builder_ubuntu,native_assets_builder_windows,native_assets_cli_macos,native_assets_cli_ubuntu,native_assets_cli_windows,native_toolchain_c_macos,native_toolchain_c_ubuntu,native_toolchain_c_windows,objective_c,swift2objc"
+          carryforward: "ffigen,jni,jnigen,native_pkgs_macos,native_pkgs_ubuntu,native_pkgs_windows,objective_c,swift2objc"
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
 
diff --git a/.github/workflows/swift2objc.yaml b/.github/workflows/swift2objc.yaml
@@ -67,6 +67,6 @@ jobs:
       - name: Upload coverage
         uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b
         with:
-          carryforward: "ffigen,jni,jnigen,native_assets_builder_macos,native_assets_builder_ubuntu,native_assets_builder_windows,native_assets_cli_macos,native_assets_cli_ubuntu,native_assets_cli_windows,native_toolchain_c_macos,native_toolchain_c_ubuntu,native_toolchain_c_windows,objective_c,swift2objc"
+          carryforward: "ffigen,jni,jnigen,native_pkgs_macos,native_pkgs_ubuntu,native_pkgs_windows,objective_c,swift2objc"
           github-token: ${{ secrets.GITHUB_TOKEN }}
           parallel-finished: true
diff --git a/pkgs/code_assets/analysis_options.yaml b/pkgs/code_assets/analysis_options.yaml
@@ -8,7 +8,7 @@ analyzer:
     strict-inference: true
     strict-raw-types: true
   plugins:
-    - custom_lint
+    # - custom_lint # https://github.com/dart-lang/sdk/issues/60784
 
 linter:
   rules:
diff --git a/pkgs/data_assets/CHANGELOG.md b/pkgs/data_assets/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 0.19.2
+## 0.19.1
 
 * Bump the SDK constraint to at least the one from `package:hooks` to fix
   dartdoc generation on https://pub.dev.
diff --git a/pkgs/data_assets/analysis_options.yaml b/pkgs/data_assets/analysis_options.yaml
@@ -8,7 +8,7 @@ analyzer:
     strict-inference: true
     strict-raw-types: true
   plugins:
-    - custom_lint
+    # - custom_lint # https://github.com/dart-lang/sdk/issues/60784
 
 linter:
   rules:
diff --git a/pkgs/hooks/analysis_options.yaml b/pkgs/hooks/analysis_options.yaml
@@ -8,7 +8,7 @@ analyzer:
     strict-inference: true
     strict-raw-types: true
   plugins:
-    - custom_lint
+    # - custom_lint # https://github.com/dart-lang/sdk/issues/60784
 
 linter:
   rules:
@@ -21,4 +21,3 @@ linter:
 custom_lint:
   rules:
     - avoid_import_outside_src
-
diff --git a/pkgs/hooks_runner/analysis_options.yaml b/pkgs/hooks_runner/analysis_options.yaml
@@ -8,7 +8,7 @@ analyzer:
     strict-inference: true
     strict-raw-types: true
   plugins:
-    - custom_lint
+    # - custom_lint # https://github.com/dart-lang/sdk/issues/60784
 
 linter:
   rules:
@@ -21,4 +21,3 @@ linter:
 custom_lint:
   rules:
     - avoid_import_outside_src
-
diff --git a/pkgs/json_syntax_generator/analysis_options.yaml b/pkgs/json_syntax_generator/analysis_options.yaml
@@ -8,7 +8,7 @@ analyzer:
     strict-inference: true
     strict-raw-types: true
   plugins:
-    - custom_lint
+    # - custom_lint # https://github.com/dart-lang/sdk/issues/60784
 
 linter:
   rules:
diff --git a/pkgs/native_toolchain_c/analysis_options.yaml b/pkgs/native_toolchain_c/analysis_options.yaml
@@ -8,7 +8,7 @@ analyzer:
     strict-inference: true
     strict-raw-types: true
   plugins:
-    - custom_lint
+    # - custom_lint # https://github.com/dart-lang/sdk/issues/60784
 
 linter:
   rules:
diff --git a/pkgs/repo_lint_rules/analysis_options.yaml b/pkgs/repo_lint_rules/analysis_options.yaml
@@ -8,7 +8,7 @@ analyzer:
     strict-inference: true
     strict-raw-types: true
   plugins:
-    - custom_lint
+    # - custom_lint # https://github.com/dart-lang/sdk/issues/60784
 
 linter:
   rules:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## 0.19.2`
	`1`	`+## 0.19.1`
`2`	`2`
`3`	`3`	* Bump the SDK constraint to at least the one from `package:hooks` to fix
`4`	`4`	`dartdoc generation on https://pub.dev.`