fix: Cache cli (#169)

* fix: Cache cli
conduit-dart · Jan 21, 2023 · 959e80b · 959e80b
1 parent a58982e
commit 959e80b
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 3 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -12,6 +12,7 @@ concurrency:
 jobs:
   smoke:
     runs-on: ubuntu-latest
+    container: centos/python-38-centos7:latest
     steps:
     - uses: actions/checkout@v3
     - uses: dart-lang/setup-dart@v1
@@ -27,6 +28,7 @@ jobs:
         cd wildfire/
         echo "----------- Building test project -----------"
         conduit build
+        conduit db generate
   unit:
     needs: smoke
     if: |

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -27,6 +27,7 @@ jobs:
         cd wildfire/
         echo "----------- Building test project -----------"
         conduit build
+        conduit db generate
   unit:
     needs: smoke
     if: |

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -27,6 +27,7 @@ jobs:
         cd wildfire/
         echo "----------- Building test project -----------"
         conduit build
+        conduit db generate
   unit:
     needs: smoke
     if: |

diff --git a/packages/cli/CHANGELOG.md b/packages/cli/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.1.6-rc.1
+
+ - **FIX**: Cache cli. ([6f72fc96](https://github.com/conduit-dart/conduit/commit/6f72fc96fc21ea41617e63b2c0f4a02f07c3af90))
+
 ## 4.1.6
 
  - **FIX**: investigate build issues ([#167](https://github.com/conduit-dart/conduit/issues/167)). ([ee79f9e6](https://github.com/conduit-dart/conduit/commit/ee79f9e69a4f6dbaefa93db78505eaf7b5a88652))

diff --git a/packages/cli/lib/src/cli/commands/build.dart b/packages/cli/lib/src/cli/commands/build.dart
@@ -5,7 +5,6 @@ import 'dart:io';
 import 'dart:mirrors';
 
 import 'package:args/args.dart' as arg_package;
-import 'package:collection/collection.dart';
 import 'package:conduit/src/cli/command.dart';
 import 'package:conduit/src/cli/metadata.dart';
 import 'package:conduit/src/cli/mixins/project.dart';
@@ -48,8 +47,8 @@ class CLIBuild extends CLICommand with CLIProject {
     final cfg = await ctx.packageConfig;
 
     final packageNames = cfg.packages
-        .map((pkg) => pkg.name)
-        .whereNot((pkg) => pkg == libraryName);
+        .where((pkg) => pkg.name.startsWith('conduit'))
+        .map((pkg) => pkg.name);
 
     const String cmd = "dart";
     final args = ["pub", "cache", "add", "-v", projectVersion!.toString()];

diff --git a/packages/cli/templates/db/pubspec.yaml b/packages/cli/templates/db/pubspec.yaml
@@ -7,6 +7,7 @@ environment:
   sdk: ">=2.18.6 <3.0.0"
 
 dependencies:
+  conduit: ^4.1.6
   conduit_core: ^4.0.0
 
 dev_dependencies:

diff --git a/packages/cli/templates/db_and_auth/pubspec.yaml b/packages/cli/templates/db_and_auth/pubspec.yaml
@@ -7,6 +7,7 @@ environment:
   sdk: ">=2.18.6 <3.0.0"
 
 dependencies:
+  conduit: ^4.1.6
   conduit_core: ^4.0.0
 
 dev_dependencies:

diff --git a/packages/cli/templates/default/pubspec.yaml b/packages/cli/templates/default/pubspec.yaml
@@ -7,6 +7,7 @@ environment:
   sdk: ">=2.18.6 <3.0.0"
 
 dependencies:
+  conduit: ^4.1.6
   conduit_core: ^4.0.0
 
 dev_dependencies: