💚 ++

cfug · Nov 7, 2023 · 5d64710 · 5d64710
1 parent 37e6c6f
commit 5d64710
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 29 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -43,14 +43,11 @@ jobs:
       - name: Check satisfied packages
         run: |
           dart ./scripts/melos_packages.dart
-          cat .melos_packages
-          cat .melos_ignore_packages
+          MELOS_IGNORE_PACKAGES=$(cat .melos_ignore_packages)
       - name: Bootstrap
         run: |
-          ls
-          export MELOS_PACKAGES=$(cat .melos_packages)
-          echo $MELOS_PACKAGES
-          melos bootstrap
+          echo $MELOS_IGNORE_PACKAGES
+          melos bootstrap $(eval echo $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,29 +23,20 @@ void main() async {
   final current = Version.parse(
     RegExp(r'\d*\.\d*\.\d*').firstMatch(Platform.version)!.group(0)!,
   );
-  final satisfiedPackages = packages
-      .map((package) {
-        if (package.pubSpec.environment!.sdkConstraint!.allows(current)) {
-          return package.name;
-        }
-        return null;
-      })
-      .whereType<String>()
-      .join(',');
-  print(satisfiedPackages);
-  File('$root/.melos_packages').writeAsStringSync(satisfiedPackages);
-  final ignoresPackages = packages
-      .map((package) {
-        if (package.pubSpec.environment!.sdkConstraint!.allows(current)) {
-          return null;
-        }
-        return package.name;
-      })
-      .whereType<String>()
-      .map((e) => '--ignore="$e"')
-      .join(' ');
-  print(ignoresPackages);
-  File('$root/.melos_ignore_packages').writeAsStringSync(ignoresPackages);
+  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(','),
+  );
+  File('$root/.melos_ignore_packages').writeAsStringSync(
+    ignoredPackages.map((e) => '--ignore="$e"').join(' '),
+  );
 }
 
 extension YamlUtils on YamlNode {