💚 ++

cfug · Nov 7, 2023 · b9bdc64 · b9bdc64
1 parent 189fef3
commit b9bdc64
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -41,14 +41,9 @@ jobs:
       - name: Patching files for Flutter ${{ matrix.sdk }}
         run: dart ./scripts/files_patch.dart
       - name: Check satisfied packages
-        run: |
-          dart ./scripts/melos_packages.dart
-          MELOS_IGNORE_PACKAGES=$(cat .melos_ignore_packages)
-          echo $MELOS_IGNORE_PACKAGES
+        run: dart ./scripts/melos_packages.dart
       - name: Bootstrap
-        run: |
-          echo $MELOS_IGNORE_PACKAGES
-          melos bootstrap $(eval echo $MELOS_IGNORE_PACKAGES)
+        run: melos bootstrap $(eval cat .melos_ignore_packages)
       - name: Format
         run: melos exec $(eval cat .melos_ignore_packages) -- "dart format --set-exit-if-changed ."
       - name: Analyze Dart packages

diff --git a/scripts/melos_packages.dart b/scripts/melos_packages.dart
@@ -23,17 +23,13 @@ void main() async {
   final current = Version.parse(
     RegExp(r'\d*\.\d*\.\d*').firstMatch(Platform.version)!.group(0)!,
   );
-  final satisfiedPackages = <String>[], ignoredPackages = <String>[];
-  for (final package in packages) {
-    if (package.pubSpec.environment!.sdkConstraint!.allows(current)) {
-      satisfiedPackages.add(package.name);
-    } else {
-      ignoredPackages.add(package.name);
-    }
-  }
-  File('$root/.melos_packages').writeAsStringSync(
-    satisfiedPackages.join(','),
-  );
+  final ignoredPackages = packages
+      .map(
+        (package) => package.pubSpec.environment!.sdkConstraint!.allows(current)
+            ? null
+            : package.name,
+      )
+      .whereType<String>();
   File('$root/.melos_ignore_packages').writeAsStringSync(
     ignoredPackages.map((e) => '--ignore="$e"').join(' '),
   );