Fix _tests.

angulardart-community · Nov 23, 2023 · b60c7bb · b60c7bb
1 parent 45de6f1
commit b60c7bb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 42 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -41,16 +41,16 @@ jobs:
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyze; Dart 3.1.0; PKGS: _tests, ngast, ngcompiler, ngdart, ngforms, ngrouter, ngtest; `dart analyze --fatal-infos .`"
+    name: "analyze; Dart 3.1.0; PKGS: ngast, ngcompiler, ngdart, ngforms, ngrouter, ngtest; `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:_tests-ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest;commands:analyze"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest;commands:analyze"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:_tests-ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest
             os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -61,15 +61,6 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - id: _tests_pub_upgrade
-        name: _tests; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: _tests
-      - name: "_tests; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps._tests_pub_upgrade.conclusion == 'success'"
-        working-directory: _tests
       - id: ngast_pub_upgrade
         name: ngast; dart pub upgrade
         run: dart pub upgrade
@@ -127,16 +118,16 @@ jobs:
     needs:
       - job_001
   job_003:
-    name: "analyze; Dart 3.1.0; PKGS: _tests, ngast, ngcompiler, ngdart, ngforms, ngrouter, ngtest; `dart format --output=none --set-exit-if-changed .`"
+    name: "analyze; Dart 3.1.0; PKGS: ngast, ngcompiler, ngdart, ngforms, ngrouter, ngtest; `dart format --output=none --set-exit-if-changed .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:_tests-ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest;commands:format"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest;commands:format"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:_tests-ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest
+            os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest
             os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -147,15 +138,6 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - id: _tests_pub_upgrade
-        name: _tests; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: _tests
-      - name: "_tests; dart format --output=none --set-exit-if-changed ."
-        run: "dart format --output=none --set-exit-if-changed ."
-        if: "always() && steps._tests_pub_upgrade.conclusion == 'success'"
-        working-directory: _tests
       - id: ngast_pub_upgrade
         name: ngast; dart pub upgrade
         run: dart pub upgrade
@@ -213,16 +195,16 @@ jobs:
     needs:
       - job_001
   job_004:
-    name: "analyze; Dart dev; PKGS: _tests, ngast, ngcompiler, ngdart, ngforms, ngrouter, ngtest; `dart analyze --fatal-infos .`"
+    name: "analyze; Dart dev; PKGS: ngast, ngcompiler, ngdart, ngforms, ngrouter, ngtest; `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:_tests-ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest;commands:analyze"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest;commands:analyze"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:_tests-ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest
+            os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:ngast-ngcompiler-ngdart-ngforms-ngrouter-ngtest
             os:ubuntu-latest;pub-cache-hosted;sdk:dev
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -233,15 +215,6 @@ jobs:
       - id: checkout
         name: Checkout repository
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
-      - id: _tests_pub_upgrade
-        name: _tests; dart pub upgrade
-        run: dart pub upgrade
-        if: "always() && steps.checkout.conclusion == 'success'"
-        working-directory: _tests
-      - name: "_tests; dart analyze --fatal-infos ."
-        run: dart analyze --fatal-infos .
-        if: "always() && steps._tests_pub_upgrade.conclusion == 'success'"
-        working-directory: _tests
       - id: ngast_pub_upgrade
         name: ngast; dart pub upgrade
         run: dart pub upgrade

diff --git a/_tests/mono_pkg.yaml b/_tests/mono_pkg.yaml
@@ -3,11 +3,6 @@ sdk:
   - dev
 
 stages:
-  - analyze:
-      - format:
-        sdk:
-          - pubspec
-      - analyze: --fatal-infos .
   - build:
       - command: dart run build_runner build --fail-on-severe
   - unit_test:

diff --git a/_tests/test/resolve_util.dart b/_tests/test/resolve_util.dart
@@ -11,7 +11,7 @@ import 'package:package_config/package_config.dart';
 import 'package:source_gen/source_gen.dart';
 
 // Use custom package config for angular sources if specified
-late final Future<PackageConfig> _packageConfigFuture = () async {
+final Future<PackageConfig> _packageConfigFuture = () async {
   Uri uri;
 
   if (Platform.environment['ANGULAR_PACKAGE_CONFIG_PATH'] case var path?) {