Added deployment type to checks

.github/workflows/deploy_homebrew.yml

@@ -9,7 +9,6 @@ jobs:
         runs-on: macos-latest
         env:
             PUB_CREDENTIALS: ${{ secrets.PUB_CREDENTIALS }}
-            GITHUB_TOKEN: ${{ secrets.HOMEBREW_FVM_GH_TOKEN }}
             GITHUB_BEARER_TOKEN: ${{ secrets.HOMEBREW_FVM_GH_TOKEN }}
         steps:
           - name: Checkout
@@ -18,6 +17,9 @@ jobs:
           - name: Prepare environment
             uses: ./.github/actions/prepare
 
+          - name: Build version and env
+            run: dart run grinder build-version --deploy-type=brew
+
           - name: Deploy homebrew
             run: dart run grinder pkg-homebrew-update
 

.github/workflows/deploy_macos.yml

@@ -9,7 +9,7 @@ jobs:
         runs-on: macos-latest
         env:
             PUB_CREDENTIALS: ${{ secrets.PUB_CREDENTIALS }}
-            GITHUB_TOKEN: ${{ secrets.HOMEBREW_FVM_GH_TOKEN }}
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
             GITHUB_BEARER_TOKEN: ${{ secrets.HOMEBREW_FVM_GH_TOKEN }}
 
         steps:
@@ -19,5 +19,9 @@ jobs:
         - name: Prepare environment
           uses: ./.github/actions/prepare
 
+        - name: Build version and env
+          run: dart run grinder build-version --deploy-type=brew
+
         - name: Deploy Github Mac
-          run: dart run grinder pkg-github-macos
+          run: dart run grinder pkg-github-macos
+

.github/workflows/deploy_windows.yml

@@ -16,6 +16,9 @@ jobs:
 
           - name: Prepare environment
             uses: ./.github/actions/prepare
+
+          - name: Build version and env
+            run: dart run grinder build-version --deploy-type=chocolatey
 
           - name: Deploy Github Windows
             run: dart run grinder pkg-github-windows

.github/workflows/release.yml

@@ -49,6 +49,9 @@ jobs:
 
           - name: Prepare environment
             uses: ./.github/actions/prepare
+
+          - name: Build version and env
+            run: dart run grinder build-version --deploy-type=chocolatey
 
           - name: Deploy Github Windows
             run: dart run grinder pkg-github-windows
@@ -61,15 +64,19 @@ jobs:
       runs-on: macos-latest
       needs: release
       env:
-          PUB_CREDENTIALS: ${{ secrets.PUB_CREDENTIALS }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_BEARER_TOKEN: ${{ secrets.HOMEBREW_FVM_GH_TOKEN }}
+
       steps:
       - name: Checkout
         uses: actions/checkout@v4
 
       - name: Prepare environment
         uses: ./.github/actions/prepare
 
+      - name: Build version and env
+        run: dart run grinder build-version --deploy-type=brew
+
       - name: Deploy Github Mac
         run: dart run grinder pkg-github-macos
 

.github/workflows/test.yml

@@ -7,6 +7,7 @@ on:
         description: "Dart SDK version"
         type: string
         required: false
+        # Version that is been tested with
         default: "3.1.3"
 
   pull_request:
@@ -21,14 +22,10 @@ concurrency:
 
 jobs:
   test:
-    name: Test on ${{ matrix.os }}
+    name: Test
     timeout-minutes: 30
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-
-    steps:        
+    runs-on: ubuntu-latest
+    steps:
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -37,35 +34,57 @@ jobs:
         with:
           sdk-version: ${{ github.event.inputs.sdk-version }}
 
-      # - name: Install DCM
-      #   uses: CQLabs/setup-dcm@v1
-      #   with:
-      #     github_token: ${{ secrets.GITHUB_TOKEN }}
-
-      # - name: Run DCM
-      #   uses: CQLabs/dcm-action@v1
-      #   with:
-      #     github_token: ${{ secrets.GITHUB_TOKEN }}
-      #     folders: lib
+      - uses: invertase/github-action-dart-analyzer@v1
+        with:
+          fatal-infos: false
 
-
-      - name: Tests
-        uses: ./.github/actions/test
-        if: matrix.os != 'ubuntu-latest'
-
+      - name: Install DCM
+        uses: CQLabs/setup-dcm@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run DCM
+        uses: CQLabs/dcm-action@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          ci_key: oss
+          email: oss
+          folders: .
+          fatal_style: true
+          fatal_performance: true
+          fatal_warnings: true
 
       - name: Install lcov
-        run: sudo apt-get install lcov 
-        if: matrix.os == 'ubuntu-latest'
+        run: sudo apt-get install lcov
 
       - name: Run tests
         uses: ./.github/actions/test
-        if: matrix.os == 'ubuntu-latest'
         with:
           with-coverage: 'true'
 
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v3
-        if: matrix.os == 'ubuntu-latest'
         env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+
+  test-os:
+    name: Test on ${{ matrix.os }}
+    needs: test
+    timeout-minutes: 30
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest]
+
+    steps:        
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Prepare environment
+        uses: ./.github/actions/prepare
+        with:
+          sdk-version: ${{ github.event.inputs.sdk-version }}
+
+      - name: Tests
+        uses: ./.github/actions/test

analysis_options.yaml

@@ -2,7 +2,6 @@ include: package:lints/recommended.yaml
 analyzer:
   exclude: 
     - "**/*.g.dart"
-    - "tool/**"
 # For lint rules and documentation, see http://dart-lang.github.io/linter/lints.
 # Uncomment to specify additional rules.
 linter:

lib/src/commands/update_command.dart

@@ -1,12 +1,13 @@
 import 'dart:io';
 
 import 'package:args/command_runner.dart';
-import 'package:fvm/constants.dart';
-import 'package:fvm/src/services/logger_service.dart';
-import 'package:fvm/src/version.g.dart';
 import 'package:mason_logger/mason_logger.dart';
 import 'package:pub_updater/pub_updater.dart';
 
+import '../../constants.dart';
+import '../services/logger_service.dart';
+import '../version.g.dart';
+
 class UpdateCommand extends Command<int> {
   static const String commandName = 'update';
 
@@ -24,16 +25,39 @@ class UpdateCommand extends Command<int> {
     } catch (error) {
       updateCheckProgress.fail();
       logger.err('$error');
+
       return ExitCode.software.code;
     }
     updateCheckProgress.complete('Checked for updates');
 
     final isUpToDate = packageVersion == latestVersion;
     if (isUpToDate) {
-      logger.info('CLI is already at the latest version.');
+      logger.success('You are already using the latest version.');
+
       return ExitCode.success.code;
     }
 
+    switch (deployType) {
+      case 'brew':
+        final upgradeCommand = cyan.wrap('brew upgrade $kPackageName');
+        logger
+          ..info('')
+          ..info('This version was installed using brew.')
+          ..notice('Please update using: $upgradeCommand');
+
+        return ExitCode.success.code;
+      case 'chocolatey':
+        final upgradeCommand = cyan.wrap('choco upgrade $kPackageName');
+        logger
+          ..info('')
+          ..info('This version was installed using chocolatey.')
+          ..notice('Please update using: $upgradeCommand');
+
+        return ExitCode.success.code;
+      default:
+        break;
+    }
+
     final updateProgress = logger.progress('Updating to $latestVersion');
 
     late final ProcessResult result;
@@ -45,12 +69,14 @@ class UpdateCommand extends Command<int> {
     } catch (error) {
       updateProgress.fail();
       logger.err('$error');
+
       return ExitCode.software.code;
     }
 
     if (result.exitCode != ExitCode.success.code) {
       updateProgress.fail();
       logger.err('Error updating CLI: ${result.stderr}');
+
       return ExitCode.software.code;
     }
 

tool/grind.dart

@@ -21,7 +21,8 @@ void main(List<String> args) {
   pkg.githubUser.value = owner;
   pkg.githubRepo.value = 'leoafarias/fvm';
   pkg.homebrewRepo.value = 'leoafarias/homebrew-fvm';
-  pkg.githubBearerToken.value = Platform.environment['GITHUB_TOKEN'];
+  pkg.githubBearerToken.value = Platform.environment['GITHUB_BEARER_TOKEN'];
+  pkg.homebrewCreateVersionedFormula.value = true;
 
   pkg.addAllTasks();
   addTask(homebrewTask());
@@ -33,6 +34,7 @@ void main(List<String> args) {
 Future<void> buildVersion() async {
   final args = context.invocation.arguments;
   final versionArg = args.getOption('version');
+  final deployTypeArg = args.getOption('deploy-type');
 
   final pubspec = await PubSpec.load(Directory.current);
   Version? version = pubspec.version;
@@ -54,9 +56,14 @@ Future<void> buildVersion() async {
     versionFile.createSync(recursive: true);
   }
 
+  if (!['pub', 'brew', 'chocolatey'].contains(deployTypeArg)) {
+    throw Exception('Invalid deploy environment: $deployTypeArg');
+  }
+
 // Add comment on top of the const that this file is generated by this command
   String fileContent = '// GENERATED CODE - DO NOT MODIFY BY HAND\n\n';
   fileContent += "const packageVersion = '$version';\n";
+  fileContent += "const deployType = '$deployTypeArg';\n";
 
   versionFile.writeAsStringSync(fileContent);