fix: Check cli integrity (#164)

j4qfrost · web-flow · commit 5fd4e4036d73 · 2023-01-07T20:01:51.000-08:00
* put smokes in os files

* add dependcy caching to build command

* core concurrency 1
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -10,7 +10,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  linux:
+  smoke:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: dart-lang/setup-dart@v1
+      with:
+        sdk: dev
+    - name: Setup Conduit
+      run: |
+        dart pub global activate -spath packages/cli
+    - name: Run tests
+      working-directory: ../
+      run: |
+        conduit create -t db_and_auth wildfire
+        cd wildfire/
+        echo "----------- Building test project -----------"
+        conduit build
+  unit:
+    needs: smoke
     if: |
       startsWith(github.head_ref, 'feature/')
       || startsWith(github.head_ref, 'fix/')
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -10,7 +10,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  macos:
+  smoke:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: dart-lang/setup-dart@v1
+      with:
+        sdk: dev
+    - name: Setup Conduit
+      run: |
+        dart pub global activate -spath packages/cli
+    - name: Run tests
+      working-directory: ../
+      run: |
+        conduit create -t db_and_auth wildfire
+        cd wildfire/
+        echo "----------- Building test project -----------"
+        conduit build
+  unit:
+    needs: smoke
     if: |
       startsWith(github.head_ref, 'feature/')
       || startsWith(github.head_ref, 'fix/')
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -10,7 +10,25 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  windows:
+  smoke:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: dart-lang/setup-dart@v1
+      with:
+        sdk: dev
+    - name: Setup Conduit
+      run: |
+        dart pub global activate -spath packages/cli
+    - name: Run tests
+      working-directory: ../
+      run: |
+        conduit create -t db_and_auth wildfire
+        cd wildfire/
+        echo "----------- Building test project -----------"
+        conduit build
+  unit:
+    needs: smoke
     if: |
       startsWith(github.head_ref, 'feature/')
       || startsWith(github.head_ref, 'fix/')
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,7 @@ stackoverflow
 **/.failed_tracker
 migration_tmp
 coverage
+application_test/
 
 doc/
 site/
diff --git a/packages/cli/dart_test.yaml b/packages/cli/dart_test.yaml
@@ -1 +1,2 @@
-timeout: 120s
+timeout: 120s
+concurrency: 1
diff --git a/packages/cli/lib/src/cli/commands/build.dart b/packages/cli/lib/src/cli/commands/build.dart
@@ -44,6 +44,36 @@ class CLIBuild extends CLICommand with CLIProject {
       getScriptSource(await getChannelName()),
     );
 
+    final cfg = await ctx.packageConfig;
+
+    final packageNames = cfg.packages
+        .where((pkg) => pkg.name.startsWith('conduit_'))
+        .map((pkg) => pkg.name);
+
+    const String cmd = "dart";
+    final args = ["pub", "cache", "add", "-v", projectVersion!.toString()];
+    for (final String name in packageNames) {
+      final res = await Process.run(
+        cmd,
+        [...args, name],
+        runInShell: true,
+      );
+      if (res.exitCode != 0) {
+        final retry = await Process.run(
+          cmd,
+          [...args.sublist(0, 3), name],
+          runInShell: true,
+        );
+        if (retry.exitCode != 0) {
+          print("${res.stdout}");
+          print("${res.stderr}");
+          throw StateError(
+            "'pub get' failed with the following message: ${res.stderr}",
+          );
+        }
+      }
+    }
+
     final bm = BuildManager(ctx);
     await bm.build();
 
diff --git a/packages/cli/lib/src/cli/mixins/project.dart b/packages/cli/lib/src/cli/mixins/project.dart
@@ -66,7 +66,7 @@ abstract class CLIProject implements CLICommand {
       final lockFileContents = loadYaml(lockFile.readAsStringSync()) as Map;
       final projectVersion =
           // ignore: avoid_dynamic_calls
-          lockFileContents["packages"]["conduit"]["version"] as String;
+          lockFileContents["packages"]["conduit_core"]["version"] as String;
       _projectVersion = Version.parse(projectVersion);
     }
 
diff --git a/packages/cli/pubspec.yaml b/packages/cli/pubspec.yaml
@@ -19,7 +19,7 @@ dependencies:
   io: ^1.0.3
   logging: ^1.0.0
   meta: ^1.1.5
-  path: ^1.6.1
+  path: ^1.8.0
   postgres: ^2.3.1
   pub_cache: ^0.3.0
   pub_semver: ^2.0.0
diff --git a/packages/core/dart_test.yaml b/packages/core/dart_test.yaml
@@ -1 +1,2 @@
-timeout: 120s
+timeout: 120s
+concurrency: 1
diff --git a/packages/core/pubspec.yaml b/packages/core/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
   io: ^1.0.3
   logging: ^1.0.0
   meta: ^1.1.5
-  path: ^1.6.1
+  path: ^1.8.0
   postgres: ^2.3.1
   pub_cache: ^0.3.0
   pub_semver: ^2.0.0

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-timeout: 120s`
	`1`	`+timeout: 120s`
	`2`	`+concurrency: 1`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ abstract class CLIProject implements CLICommand {`
`66`	`66`	`final lockFileContents = loadYaml(lockFile.readAsStringSync()) as Map;`
`67`	`67`	`final projectVersion =`
`68`	`68`	`// ignore: avoid_dynamic_calls`
`69`		`- lockFileContents["packages"]["conduit"]["version"] as String;`
	`69`	`+ lockFileContents["packages"]["conduit_core"]["version"] as String;`
`70`	`70`	`_projectVersion = Version.parse(projectVersion);`
`71`	`71`	`}`
`72`	`72`