⬆️ update mono_repo (#462)

lejard-h · Aug 2, 2023 · 7a6b5b9 · 7a6b5b9
1 parent a386e86
commit 7a6b5b9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 37 deletions.
diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml
@@ -1,4 +1,4 @@
-# Created with package:mono_repo v6.5.5
+# Created with package:mono_repo v6.5.7
 name: Dart CI
 on:
   push:
@@ -37,20 +37,20 @@ jobs:
         name: Checkout repository
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
       - name: mono_repo self validate
-        run: dart pub global activate mono_repo 6.5.5
+        run: dart pub global activate mono_repo 6.5.7
       - name: mono_repo self validate
         run: dart pub global run mono_repo generate --validate
   job_002:
-    name: "analyze_and_format; PKG: chopper; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
+    name: "analyze_and_format; PKGS: chopper, chopper_built_value, chopper_generator; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
     runs-on: ubuntu-latest
     steps:
       - name: Cache Pub hosted dependencies
         uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
         with:
           path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:chopper;commands:format-analyze"
+          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:chopper-chopper_built_value-chopper_generator;commands:format-analyze"
           restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:chopper
+            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:chopper-chopper_built_value-chopper_generator
             os:ubuntu-latest;pub-cache-hosted;sdk:stable
             os:ubuntu-latest;pub-cache-hosted
             os:ubuntu-latest
@@ -74,29 +74,6 @@ jobs:
         run: dart analyze --fatal-infos .
         if: "always() && steps.chopper_pub_upgrade.conclusion == 'success'"
         working-directory: chopper
-    needs:
-      - job_001
-  job_003:
-    name: "analyzer_and_format; PKGS: chopper_built_value, chopper_generator; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`"
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cache Pub hosted dependencies
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8
-        with:
-          path: "~/.pub-cache/hosted"
-          key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:chopper_built_value-chopper_generator;commands:format-analyze"
-          restore-keys: |
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:chopper_built_value-chopper_generator
-            os:ubuntu-latest;pub-cache-hosted;sdk:stable
-            os:ubuntu-latest;pub-cache-hosted
-            os:ubuntu-latest
-      - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f
-        with:
-          sdk: stable
-      - id: checkout
-        name: Checkout repository
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
       - id: chopper_built_value_pub_upgrade
         name: chopper_built_value; dart pub upgrade
         run: dart pub upgrade
@@ -125,8 +102,7 @@ jobs:
         working-directory: chopper_generator
     needs:
       - job_001
-      - job_002
-  job_004:
+  job_003:
     name: "unit_test; PKGS: chopper, chopper_built_value, chopper_generator; `dart pub global run coverage:test_with_coverage`"
     runs-on: ubuntu-latest
     steps:
@@ -197,8 +173,7 @@ jobs:
     needs:
       - job_001
       - job_002
-      - job_003
-  job_005:
+  job_004:
     name: "unit_test; PKGS: chopper, chopper_built_value; `dart test -p chrome`"
     runs-on: ubuntu-latest
     steps:
@@ -240,4 +215,3 @@ jobs:
     needs:
       - job_001
       - job_002
-      - job_003
diff --git a/chopper_built_value/mono_pkg.yaml b/chopper_built_value/mono_pkg.yaml
@@ -2,7 +2,7 @@ sdk:
  - stable
 
 stages:
-- analyzer_and_format:
+- analyze_and_format:
   - group:
     - format
     - analyze: --fatal-infos .

diff --git a/chopper_generator/mono_pkg.yaml b/chopper_generator/mono_pkg.yaml
@@ -2,7 +2,7 @@ sdk:
  - stable
 
 stages:
-- analyzer_and_format:
+- analyze_and_format:
   - group:
     - format
     - analyze: --fatal-infos .

diff --git a/mono_repo.yaml b/mono_repo.yaml
@@ -12,7 +12,7 @@ github:
         - develop
 
 merge_stages:
-  - analyzer_and_format
+  - analyze_and_format
   - unit_test
 
 coverage_service:

diff --git a/tool/ci.sh b/tool/ci.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Created with package:mono_repo v6.5.5
+# Created with package:mono_repo v6.5.7
 
 # Support built in commands on windows out of the box.
 # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter")