From 0f98ee64c8bb1732e8bdbe3c72b4d4e0b10f6c45 Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 13 Oct 2025 15:49:51 -0700 Subject: [PATCH 1/3] Require Dart 3.8, bump deps, regenerate code, update actions --- .github/workflows/dart.yml | 26 ++-- mono_repo/CHANGELOG.md | 5 + .../src/commands/github/action_versions.dart | 8 +- mono_repo/lib/src/commands/github/job.g.dart | 55 ++++---- mono_repo/lib/src/commands/github/step.g.dart | 63 ++++----- mono_repo/lib/src/github_config.g.dart | 126 +++++++++--------- mono_repo/lib/src/mono_config.g.dart | 32 ++--- mono_repo/lib/src/package_config.g.dart | 24 ++-- mono_repo/lib/src/raw_config.g.dart | 76 +++++------ mono_repo/lib/src/version.dart | 2 +- mono_repo/pubspec.yaml | 28 ++-- tool/ci.sh | 2 +- 12 files changed, 217 insertions(+), 230 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index c060e896..49312038 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.6.3 +# Created with package:mono_repo v6.6.4 name: Dart CI on: push: @@ -119,23 +119,23 @@ jobs: if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'" working-directory: test_pkg job_004: - name: "smoke_test; linux; Dart 3.4.0; PKG: mono_repo; `dart analyze`" + name: "smoke_test; linux; Dart 3.8.0; PKG: mono_repo; `dart analyze`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:mono_repo;commands:analyze_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:mono_repo;commands:analyze_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:mono_repo - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:mono_repo + os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: - sdk: "3.4.0" + sdk: "3.8.0" - id: checkout name: Checkout repository uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 @@ -430,23 +430,23 @@ jobs: if: "always() && steps.test_pkg_pub_upgrade.conclusion == 'success'" working-directory: test_pkg job_013: - name: "test; linux; Dart 3.4.0; PKG: mono_repo; `dart test -x yaml -P presubmit --test-randomize-ordering-seed=random`" + name: "test; linux; Dart 3.8.0; PKG: mono_repo; `dart test -x yaml -P presubmit --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:mono_repo;commands:test_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:mono_repo;commands:test_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:mono_repo - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0;packages:mono_repo + os:ubuntu-latest;pub-cache-hosted;sdk:3.8.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: - sdk: "3.4.0" + sdk: "3.8.0" - id: checkout name: Checkout repository uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 @@ -779,13 +779,13 @@ jobs: - job_011 - job_012 job_020: - name: "test; windows; Dart 3.4.0; PKG: mono_repo; `dart test -x yaml -P presubmit --test-randomize-ordering-seed=random`" + name: "test; windows; Dart 3.8.0; PKG: mono_repo; `dart test -x yaml -P presubmit --test-randomize-ordering-seed=random`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c with: - sdk: "3.4.0" + sdk: "3.8.0" - id: checkout name: Checkout repository uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 diff --git a/mono_repo/CHANGELOG.md b/mono_repo/CHANGELOG.md index c4ef6d70..d31224e6 100644 --- a/mono_repo/CHANGELOG.md +++ b/mono_repo/CHANGELOG.md @@ -1,3 +1,8 @@ +## 6.6.4 + +- Update to latest action versions. +- Require `sdk: ^3.7.0`. + ## 6.6.3 - Update to latest action versions. diff --git a/mono_repo/lib/src/commands/github/action_versions.dart b/mono_repo/lib/src/commands/github/action_versions.dart index a0288f36..8bd63db3 100644 --- a/mono_repo/lib/src/commands/github/action_versions.dart +++ b/mono_repo/lib/src/commands/github/action_versions.dart @@ -6,10 +6,10 @@ // // To regenerate it, run the `tool/generate_action_versions.dart` script. -const actionsCacheVersion = 'd4323d4df104b026a6aa633fdb11d772146be0bf'; +const actionsCacheVersion = '0057852bfaa89a56745cba8c7296529d2fc39830'; const dartLangSetupDartVersion = 'e51d8e571e22473a2ddebf0ef8a2123f0ab2c02c'; -const actionsCheckoutVersion = '11bd71901bbe5b1630ceea73d27597364c9af683'; -const subositoFlutterActionVersion = 'f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff'; +const actionsCheckoutVersion = '08c6903cd8c0fde910a37f88322edcfb5dd907a8'; +const subositoFlutterActionVersion = 'fd55f4c5af5b953cc57a2be44cb082c8f6635e8e'; const coverallsappGithubActionVersion = '648a8eb78e6d50909eff900e4ec85cab4524a45b'; -const codecovCodecovActionVersion = '0565863a31f2c772f9f0395002a31e3f06189574'; +const codecovCodecovActionVersion = '5a1091511ad55cbe89839c7260b706298ca349f7'; diff --git a/mono_repo/lib/src/commands/github/job.g.dart b/mono_repo/lib/src/commands/github/job.g.dart index 0a06954a..d4c349c4 100644 --- a/mono_repo/lib/src/commands/github/job.g.dart +++ b/mono_repo/lib/src/commands/github/job.g.dart @@ -8,37 +8,28 @@ part of 'job.dart'; // JsonSerializableGenerator // ************************************************************************** -Job _$JobFromJson(Map json) => $checkedCreate( - 'Job', - json, - ($checkedConvert) { - $checkKeys( - json, - requiredKeys: const ['steps'], - ); - final val = Job( - name: $checkedConvert('name', (v) => v as String?), - runsOn: $checkedConvert('runs-on', (v) => v as String?), - steps: $checkedConvert( - 'steps', - (v) => (v as List) - .map((e) => Step.fromJson(e as Map)) - .toList()), - ); - $checkedConvert('if', (v) => val.ifContent = v as String?); - $checkedConvert( - 'needs', - (v) => val.needs = - (v as List?)?.map((e) => e as String).toList()); - return val; - }, - fieldKeyMap: const {'runsOn': 'runs-on', 'ifContent': 'if'}, - ); +Job _$JobFromJson(Map json) => $checkedCreate('Job', json, ($checkedConvert) { + $checkKeys(json, requiredKeys: const ['steps']); + final val = Job( + name: $checkedConvert('name', (v) => v as String?), + runsOn: $checkedConvert('runs-on', (v) => v as String?), + steps: $checkedConvert( + 'steps', + (v) => (v as List).map((e) => Step.fromJson(e as Map)).toList(), + ), + ); + $checkedConvert('if', (v) => val.ifContent = v as String?); + $checkedConvert( + 'needs', + (v) => val.needs = (v as List?)?.map((e) => e as String).toList(), + ); + return val; +}, fieldKeyMap: const {'runsOn': 'runs-on', 'ifContent': 'if'}); Map _$JobToJson(Job instance) => { - if (instance.name case final value?) 'name': value, - if (instance.runsOn case final value?) 'runs-on': value, - if (instance.ifContent case final value?) 'if': value, - 'steps': instance.steps.map((e) => e.toJson()).toList(), - if (instance.needs case final value?) 'needs': value, - }; + 'name': ?instance.name, + 'runs-on': ?instance.runsOn, + 'if': ?instance.ifContent, + 'steps': instance.steps.map((e) => e.toJson()).toList(), + 'needs': ?instance.needs, +}; diff --git a/mono_repo/lib/src/commands/github/step.g.dart b/mono_repo/lib/src/commands/github/step.g.dart index c17cb787..d374e777 100644 --- a/mono_repo/lib/src/commands/github/step.g.dart +++ b/mono_repo/lib/src/commands/github/step.g.dart @@ -9,37 +9,38 @@ part of 'step.dart'; // ************************************************************************** Step _$StepFromJson(Map json) => $checkedCreate( - 'Step', - json, - ($checkedConvert) { - final val = Step._( - id: $checkedConvert('id', (v) => v as String?), - withContent: $checkedConvert('with', (v) => v as Map?), - name: $checkedConvert('name', (v) => v as String?), - uses: $checkedConvert('uses', (v) => v as String?), - run: $checkedConvert('run', (v) => v as String?), - ifContent: $checkedConvert('if', (v) => v as String?), - workingDirectory: - $checkedConvert('working-directory', (v) => v as String?), - env: $checkedConvert('env', (v) => v as Map?), - ); - return val; - }, - fieldKeyMap: const { - 'withContent': 'with', - 'ifContent': 'if', - 'workingDirectory': 'working-directory' - }, + 'Step', + json, + ($checkedConvert) { + final val = Step._( + id: $checkedConvert('id', (v) => v as String?), + withContent: $checkedConvert('with', (v) => v as Map?), + name: $checkedConvert('name', (v) => v as String?), + uses: $checkedConvert('uses', (v) => v as String?), + run: $checkedConvert('run', (v) => v as String?), + ifContent: $checkedConvert('if', (v) => v as String?), + workingDirectory: $checkedConvert( + 'working-directory', + (v) => v as String?, + ), + env: $checkedConvert('env', (v) => v as Map?), ); + return val; + }, + fieldKeyMap: const { + 'withContent': 'with', + 'ifContent': 'if', + 'workingDirectory': 'working-directory', + }, +); Map _$StepToJson(Step instance) => { - if (instance.id case final value?) 'id': value, - if (instance.name case final value?) 'name': value, - if (instance.run case final value?) 'run': value, - if (instance.ifContent case final value?) 'if': value, - if (instance.workingDirectory case final value?) - 'working-directory': value, - if (instance.env case final value?) 'env': value, - if (instance.uses case final value?) 'uses': value, - if (instance.withContent case final value?) 'with': value, - }; + 'id': ?instance.id, + 'name': ?instance.name, + 'run': ?instance.run, + 'if': ?instance.ifContent, + 'working-directory': ?instance.workingDirectory, + 'env': ?instance.env, + 'uses': ?instance.uses, + 'with': ?instance.withContent, +}; diff --git a/mono_repo/lib/src/github_config.g.dart b/mono_repo/lib/src/github_config.g.dart index 2a267a4e..6f8db599 100644 --- a/mono_repo/lib/src/github_config.g.dart +++ b/mono_repo/lib/src/github_config.g.dart @@ -9,71 +9,67 @@ part of 'github_config.dart'; // ************************************************************************** GitHubConfig _$GitHubConfigFromJson(Map json) => $checkedCreate( - 'GitHubConfig', + 'GitHubConfig', + json, + ($checkedConvert) { + $checkKeys( json, - ($checkedConvert) { - $checkKeys( - json, - allowedKeys: const [ - 'env', - 'on', - 'on_completion', - 'dependabot', - 'cron', - 'stages', - 'workflows' - ], - ); - final val = GitHubConfig( - $checkedConvert( - 'env', - (v) => (v as Map?)?.map( - (k, e) => MapEntry(k as String, e), - )), - $checkedConvert( - 'on', - (v) => (v as Map?)?.map( - (k, e) => MapEntry(k as String, e), - )), - $checkedConvert( - 'on_completion', - (v) => (v as List?) - ?.map((e) => Job.fromJson(e as Map)) - .toList()), - $checkedConvert('cron', (v) => v as String?), - $checkedConvert('stages', (v) => v as List?), - $checkedConvert( - 'workflows', - (v) => (v as Map?)?.map( - (k, e) => MapEntry( - k as String, GitHubWorkflow.fromJson(e as Map)), - )), - $checkedConvert( - 'dependabot', - (v) => (v as Map?)?.map( - (k, e) => MapEntry(k as String, e), - )), - ); - return val; - }, - fieldKeyMap: const {'onCompletion': 'on_completion'}, + allowedKeys: const [ + 'env', + 'on', + 'on_completion', + 'dependabot', + 'cron', + 'stages', + 'workflows', + ], ); - -GitHubWorkflow _$GitHubWorkflowFromJson(Map json) => $checkedCreate( - 'GitHubWorkflow', - json, - ($checkedConvert) { - $checkKeys( - json, - allowedKeys: const ['name', 'stages'], - requiredKeys: const ['name', 'stages'], - disallowNullValues: const ['name', 'stages'], - ); - final val = GitHubWorkflow( - $checkedConvert('name', (v) => v as String), - $checkedConvert('stages', - (v) => (v as List).map((e) => e as String).toSet()), - ); - return val; - }, + final val = GitHubConfig( + $checkedConvert( + 'env', + (v) => (v as Map?)?.map((k, e) => MapEntry(k as String, e)), + ), + $checkedConvert( + 'on', + (v) => (v as Map?)?.map((k, e) => MapEntry(k as String, e)), + ), + $checkedConvert( + 'on_completion', + (v) => + (v as List?)?.map((e) => Job.fromJson(e as Map)).toList(), + ), + $checkedConvert('cron', (v) => v as String?), + $checkedConvert('stages', (v) => v as List?), + $checkedConvert( + 'workflows', + (v) => (v as Map?)?.map( + (k, e) => MapEntry(k as String, GitHubWorkflow.fromJson(e as Map)), + ), + ), + $checkedConvert( + 'dependabot', + (v) => (v as Map?)?.map((k, e) => MapEntry(k as String, e)), + ), ); + return val; + }, + fieldKeyMap: const {'onCompletion': 'on_completion'}, +); + +GitHubWorkflow _$GitHubWorkflowFromJson(Map json) => + $checkedCreate('GitHubWorkflow', json, ($checkedConvert) { + $checkKeys( + json, + allowedKeys: const ['name', 'stages'], + requiredKeys: const ['name', 'stages'], + disallowNullValues: const ['name', 'stages'], + ); + final val = GitHubWorkflow( + $checkedConvert('name', (v) => v as String), + $checkedConvert( + 'stages', + (v) => (v as List).map((e) => e as String).toSet(), + ), + ); + return val; + }); diff --git a/mono_repo/lib/src/mono_config.g.dart b/mono_repo/lib/src/mono_config.g.dart index 03de6196..a27cd39c 100644 --- a/mono_repo/lib/src/mono_config.g.dart +++ b/mono_repo/lib/src/mono_config.g.dart @@ -8,21 +8,17 @@ part of 'mono_config.dart'; // JsonSerializableGenerator // ************************************************************************** -ConditionalStage _$ConditionalStageFromJson(Map json) => $checkedCreate( - 'ConditionalStage', - json, - ($checkedConvert) { - $checkKeys( - json, - allowedKeys: const ['name', 'if'], - requiredKeys: const ['name', 'if'], - disallowNullValues: const ['name', 'if'], - ); - final val = ConditionalStage( - $checkedConvert('name', (v) => v as String), - $checkedConvert('if', (v) => v as String?), - ); - return val; - }, - fieldKeyMap: const {'ifCondition': 'if'}, - ); +ConditionalStage _$ConditionalStageFromJson(Map json) => + $checkedCreate('ConditionalStage', json, ($checkedConvert) { + $checkKeys( + json, + allowedKeys: const ['name', 'if'], + requiredKeys: const ['name', 'if'], + disallowNullValues: const ['name', 'if'], + ); + final val = ConditionalStage( + $checkedConvert('name', (v) => v as String), + $checkedConvert('if', (v) => v as String?), + ); + return val; + }, fieldKeyMap: const {'ifCondition': 'if'}); diff --git a/mono_repo/lib/src/package_config.g.dart b/mono_repo/lib/src/package_config.g.dart index 645117d7..b2c9adcc 100644 --- a/mono_repo/lib/src/package_config.g.dart +++ b/mono_repo/lib/src/package_config.g.dart @@ -9,14 +9,14 @@ part of 'package_config.dart'; // ************************************************************************** Map _$CIJobToJson(CIJob instance) => { - if (instance.description case final value?) 'description': value, - 'os': instance.os, - 'package': instance.package, - 'sdk': instance.sdk, - 'stageName': instance.stageName, - 'tasks': instance.tasks.map((e) => e.toJson()).toList(), - 'flavor': _$PackageFlavorEnumMap[instance.flavor]!, - }; + 'description': ?instance.description, + 'os': instance.os, + 'package': instance.package, + 'sdk': instance.sdk, + 'stageName': instance.stageName, + 'tasks': instance.tasks.map((e) => e.toJson()).toList(), + 'flavor': _$PackageFlavorEnumMap[instance.flavor]!, +}; const _$PackageFlavorEnumMap = { PackageFlavor.dart: 'dart', @@ -24,7 +24,7 @@ const _$PackageFlavorEnumMap = { }; Map _$TaskToJson(Task instance) => { - 'flavor': _$PackageFlavorEnumMap[instance.flavor]!, - 'type': instance.type, - if (instance.args case final value?) 'args': value, - }; + 'flavor': _$PackageFlavorEnumMap[instance.flavor]!, + 'type': instance.type, + 'args': ?instance.args, +}; diff --git a/mono_repo/lib/src/raw_config.g.dart b/mono_repo/lib/src/raw_config.g.dart index 1e8e2f05..f46082d0 100644 --- a/mono_repo/lib/src/raw_config.g.dart +++ b/mono_repo/lib/src/raw_config.g.dart @@ -8,43 +8,41 @@ part of 'raw_config.dart'; // JsonSerializableGenerator // ************************************************************************** -RawConfig _$RawConfigFromJson(Map json) => $checkedCreate( - 'RawConfig', - json, - ($checkedConvert) { - $checkKeys( - json, - allowedKeys: const ['os', 'sdk', 'stages', 'cache'], - ); - final val = RawConfig( - oses: $checkedConvert( - 'os', - (v) => - (v as List?)?.map((e) => e as String).toList() ?? - ['linux']), - sdks: $checkedConvert('sdk', - (v) => (v as List?)?.map((e) => e as String).toList()), - stages: $checkedConvert( - 'stages', - (v) => (v as List?) - ?.map((e) => RawStage.fromJson(e as Map)) - .toList()), - cache: $checkedConvert( - 'cache', (v) => v == null ? null : RawCache.fromJson(v as Map)), - ); - return val; - }, - fieldKeyMap: const {'oses': 'os', 'sdks': 'sdk'}, - ); +RawConfig _$RawConfigFromJson(Map json) => $checkedCreate('RawConfig', json, ( + $checkedConvert, +) { + $checkKeys(json, allowedKeys: const ['os', 'sdk', 'stages', 'cache']); + final val = RawConfig( + oses: $checkedConvert( + 'os', + (v) => + (v as List?)?.map((e) => e as String).toList() ?? ['linux'], + ), + sdks: $checkedConvert( + 'sdk', + (v) => (v as List?)?.map((e) => e as String).toList(), + ), + stages: $checkedConvert( + 'stages', + (v) => (v as List?) + ?.map((e) => RawStage.fromJson(e as Map)) + .toList(), + ), + cache: $checkedConvert( + 'cache', + (v) => v == null ? null : RawCache.fromJson(v as Map), + ), + ); + return val; +}, fieldKeyMap: const {'oses': 'os', 'sdks': 'sdk'}); -RawCache _$RawCacheFromJson(Map json) => $checkedCreate( - 'RawCache', - json, - ($checkedConvert) { - final val = RawCache( - $checkedConvert('directories', - (v) => (v as List).map((e) => e as String).toList()), - ); - return val; - }, - ); +RawCache _$RawCacheFromJson(Map json) => + $checkedCreate('RawCache', json, ($checkedConvert) { + final val = RawCache( + $checkedConvert( + 'directories', + (v) => (v as List).map((e) => e as String).toList(), + ), + ); + return val; + }); diff --git a/mono_repo/lib/src/version.dart b/mono_repo/lib/src/version.dart index 5dc4a885..098bb1a9 100644 --- a/mono_repo/lib/src/version.dart +++ b/mono_repo/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '6.6.3'; +const packageVersion = '6.6.4'; diff --git a/mono_repo/pubspec.yaml b/mono_repo/pubspec.yaml index fc6a1d34..b8dad453 100644 --- a/mono_repo/pubspec.yaml +++ b/mono_repo/pubspec.yaml @@ -2,7 +2,7 @@ name: mono_repo description: >- CLI tools to make it easier to manage a single source repository containing multiple Dart packages. -version: 6.6.3 +version: 6.6.4 repository: https://github.com/google/mono_repo.dart topics: @@ -10,29 +10,29 @@ topics: - repository-management environment: - sdk: ^3.4.0 + sdk: ^3.8.0 dependencies: args: ^2.0.0 - checked_yaml: ^2.0.0 - collection: ^1.14.3 + checked_yaml: ^2.0.1 + collection: ^1.19.0 graphs: ^2.2.0 io: ^1.0.0 json_annotation: ^4.9.0 - meta: ^1.0.0 - path: ^1.4.1 - pub_semver: ^2.0.0 + meta: ^1.15.0 + path: ^1.9.0 + pub_semver: ^2.1.4 pubspec_parse: ^1.4.0 - yaml: ^3.0.0 + yaml: ^3.1.2 dev_dependencies: - build_runner: ^2.0.1 - build_test: ^2.0.0 + build_runner: ^2.5.0 + build_test: ^3.0.0 build_verify: ^3.0.0 - build_version: ^2.0.0 - json_serializable: ^6.6.0 - term_glyph: ^1.0.0 - test: ^1.16.5 + build_version: ^2.0.3 + json_serializable: ^6.9.2 + term_glyph: ^1.2.0 + test: ^1.25.9 test_descriptor: ^2.0.0 test_process: ^2.0.0 diff --git a/tool/ci.sh b/tool/ci.sh index cad537cc..d0485e05 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Created with package:mono_repo v6.6.3 +# Created with package:mono_repo v6.6.4 # Support built in commands on windows out of the box. From 2e749e11b8b654a0fb373ba7371201fb6efb73ca Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 13 Oct 2025 16:01:45 -0700 Subject: [PATCH 2/3] dart format --- mono_repo/lib/src/ci_shared.dart | 50 +- mono_repo/lib/src/ci_test_script.dart | 3 +- mono_repo/lib/src/commands/check.dart | 6 +- .../lib/src/commands/ci_script/generate.dart | 26 +- mono_repo/lib/src/commands/dart.dart | 22 +- mono_repo/lib/src/commands/generate.dart | 3 +- .../lib/src/commands/github/action_info.dart | 26 +- .../lib/src/commands/github/generate.dart | 35 +- .../lib/src/commands/github/github_yaml.dart | 112 ++-- mono_repo/lib/src/commands/github/job.dart | 11 +- mono_repo/lib/src/commands/github/step.dart | 16 +- mono_repo/lib/src/commands/list_command.dart | 32 +- .../lib/src/commands/mono_repo_command.dart | 6 +- mono_repo/lib/src/commands/presubmit.dart | 39 +- .../lib/src/commands/readme_command.dart | 18 +- mono_repo/lib/src/github_config.dart | 32 +- mono_repo/lib/src/mono_config.dart | 27 +- mono_repo/lib/src/package_config.dart | 51 +- mono_repo/lib/src/raw_config.dart | 15 +- mono_repo/lib/src/root_config.dart | 26 +- mono_repo/lib/src/runner.dart | 25 +- mono_repo/lib/src/task_type.dart | 49 +- mono_repo/lib/src/utilities.dart | 16 +- mono_repo/lib/src/yaml.dart | 15 +- mono_repo/test/action_versions_test.dart | 8 +- mono_repo/test/check_comand_test.dart | 11 +- mono_repo/test/dart_command_test.dart | 18 +- mono_repo/test/generate_test.dart | 249 ++++----- mono_repo/test/github_command_test.dart | 98 ++-- mono_repo/test/list_command_test.dart | 12 +- mono_repo/test/mono_config_test.dart | 484 ++++++++---------- mono_repo/test/presubmit_command_test.dart | 123 +++-- mono_repo/test/readme_command_test.dart | 15 +- mono_repo/test/readme_test.dart | 22 +- mono_repo/test/root_config_test.dart | 5 +- mono_repo/test/shared.dart | 60 +-- mono_repo/test/src/expected_output.dart | 6 +- mono_repo/test/yaml_write_test.dart | 6 +- mono_repo/tool/generate_action_versions.dart | 28 +- 39 files changed, 803 insertions(+), 1003 deletions(-) diff --git a/mono_repo/lib/src/ci_shared.dart b/mono_repo/lib/src/ci_shared.dart index 05437ce3..969279f3 100644 --- a/mono_repo/lib/src/ci_shared.dart +++ b/mono_repo/lib/src/ci_shared.dart @@ -69,10 +69,7 @@ class CIJobEntry { Map> groupCIJobEntries(List jobEntries) => groupBy( jobEntries, - (e) => [ - ...e.job.groupByKeys, - e.commands, - ].join(':::'), + (e) => [...e.job.groupByKeys, e.commands].join(':::'), ); void validateRootConfig(RootConfig rootConfig) { @@ -83,17 +80,19 @@ void validateRootConfig(RootConfig rootConfig) { continue; } - final disallowedExplicitVersions = config.jobs - .map((tj) => tj.explicitSdkVersion) - .whereType() - .toSet() - .where((v) => !sdkConstraint.allows(v)) - .toList() - ..sort(); + final disallowedExplicitVersions = + config.jobs + .map((tj) => tj.explicitSdkVersion) + .whereType() + .toSet() + .where((v) => !sdkConstraint.allows(v)) + .toList() + ..sort(); if (disallowedExplicitVersions.isNotEmpty) { - final disallowedString = - disallowedExplicitVersions.map((v) => '`$v`').join(', '); + final disallowedString = disallowedExplicitVersions + .map((v) => '`$v`') + .join(', '); print( yellow.wrap( ' There are jobs defined that are not compatible with ' @@ -129,15 +128,15 @@ void writeFile( @visibleForTesting List scriptLines(String scriptPath) => [ - 'Make sure to mark `$scriptPath` as executable.', - ' chmod +x $scriptPath', - if (Platform.isWindows) ...[ - 'It appears you are using Windows, and may not have access to chmod.', - 'If you are using git, the following will emulate the Unix permissions ' - 'change:', - ' git update-index --add --chmod=+x $scriptPath', - ], - ]; + 'Make sure to mark `$scriptPath` as executable.', + ' chmod +x $scriptPath', + if (Platform.isWindows) ...[ + 'It appears you are using Windows, and may not have access to chmod.', + 'If you are using git, the following will emulate the Unix permissions ' + 'change:', + ' git update-index --add --chmod=+x $scriptPath', + ], +]; /// Gives a map of command to unique task key for all [configs]. Map extractCommands(Iterable configs) { @@ -241,7 +240,8 @@ List calculateOrderedStages( throw UserException( 'Error parsing mono_repo.yaml', - details: 'One or more stage was referenced in `mono_repo.yaml` that do ' + details: + 'One or more stage was referenced in `mono_repo.yaml` that do ' 'not exist in any `$monoPkgFileName` files: $items.', ); } @@ -252,9 +252,7 @@ List calculateOrderedStages( // as a secondary sort. This is an intuitive secondary sort order as it // follows the order given in configuration files. final keys = edges.keys.toList(); - final edgeIndexes = { - for (var i = 0; i < keys.length; i++) keys[i]: i, - }; + final edgeIndexes = {for (var i = 0; i < keys.length; i++) keys[i]: i}; // Orders by dependencies first, and detect cycles (which aren't allowed). // Our edges here are actually reverse edges already, so a topological sort diff --git a/mono_repo/lib/src/ci_test_script.dart b/mono_repo/lib/src/ci_test_script.dart index 80995049..2fd3c640 100644 --- a/mono_repo/lib/src/ci_test_script.dart +++ b/mono_repo/lib/src/ci_test_script.dart @@ -30,7 +30,8 @@ function $commandName() { }'''; } -final bashScriptHeader = ''' +final bashScriptHeader = + ''' #!/bin/bash $createdWith diff --git a/mono_repo/lib/src/commands/check.dart b/mono_repo/lib/src/commands/check.dart index 467c8180..d2288d8a 100644 --- a/mono_repo/lib/src/commands/check.dart +++ b/mono_repo/lib/src/commands/check.dart @@ -36,10 +36,8 @@ Map getPackageReports(RootConfig rootConfig) { final siblings = rootConfig.map((pc) => pc.pubspec).toSet(); return Map.fromEntries( rootConfig.map( - (p) => MapEntry( - p.relativePath, - PackageReport.create(p.pubspec, siblings), - ), + (p) => + MapEntry(p.relativePath, PackageReport.create(p.pubspec, siblings)), ), ); } diff --git a/mono_repo/lib/src/commands/ci_script/generate.dart b/mono_repo/lib/src/commands/ci_script/generate.dart index af0460b3..2cc5b1ea 100644 --- a/mono_repo/lib/src/commands/ci_script/generate.dart +++ b/mono_repo/lib/src/commands/ci_script/generate.dart @@ -13,24 +13,12 @@ import '../../user_exception.dart'; const ciScriptPath = 'tool/ci.sh'; -void generateCIScript( - RootConfig rootConfig, { - bool validateOnly = false, -}) { +void generateCIScript(RootConfig rootConfig, {bool validateOnly = false}) { final ciScript = _GeneratedCIScript.generate(rootConfig).ciScript; if (validateOnly) { - _validateFile( - rootConfig.rootDirectory, - ciScript, - ciScriptPath, - ); + _validateFile(rootConfig.rootDirectory, ciScript, ciScriptPath); } else { - writeFile( - rootConfig.rootDirectory, - ciScriptPath, - ciScript, - isScript: true, - ); + writeFile(rootConfig.rootDirectory, ciScriptPath, ciScript, isScript: true); } } @@ -57,10 +45,10 @@ class _GeneratedCIScript { /// the `--validate` option. class CIScriptOutOfDateException extends UserException { CIScriptOutOfDateException() - : super( - 'Generated ci script is out of date', - details: 'Rerun `mono_repo generate` to update the generated script', - ); + : super( + 'Generated ci script is out of date', + details: 'Rerun `mono_repo generate` to update the generated script', + ); } /// Checks [expectedPath] versus the content in [expectedContent]. diff --git a/mono_repo/lib/src/commands/dart.dart b/mono_repo/lib/src/commands/dart.dart index 3bc18d7e..09c15dc5 100644 --- a/mono_repo/lib/src/commands/dart.dart +++ b/mono_repo/lib/src/commands/dart.dart @@ -26,11 +26,7 @@ class DartCommand extends MonoRepoCommand { 'packages.'; @override - Future run() => dart( - rootConfig(), - arguments, - executableForPackage, - ); + Future run() => dart(rootConfig(), arguments, executableForPackage); /// The arguments to pass to the executable. List get arguments => argResults?.rest ?? const []; @@ -61,10 +57,7 @@ Future dart( print(''); print( - wrapWith( - '`$dir`: Starting `${args.join(' ')}`', - [styleBold, lightBlue], - ), + wrapWith('`$dir`: Starting `${args.join(' ')}`', [styleBold, lightBlue]), ); final workingDir = p.join(rootConfig.rootDirectory, dir); @@ -116,14 +109,11 @@ final String _dartPath = p.join(_sdkDir, 'bin', 'dart'); /// The "flutter[.bat]" command. final String _flutterPath = Platform.isWindows ? 'flutter.bat' : 'flutter'; -enum Executable { - dart, - flutter, -} +enum Executable { dart, flutter } extension ExecutablePath on Executable { String get path => switch (this) { - Executable.dart => _dartPath, - Executable.flutter => _flutterPath, - }; + Executable.dart => _dartPath, + Executable.flutter => _flutterPath, + }; } diff --git a/mono_repo/lib/src/commands/generate.dart b/mono_repo/lib/src/commands/generate.dart index 85bcc81c..2f86500c 100644 --- a/mono_repo/lib/src/commands/generate.dart +++ b/mono_repo/lib/src/commands/generate.dart @@ -20,7 +20,8 @@ class GenerateCommand extends MonoRepoCommand { argParser.addFlag( 'validate', negatable: false, - help: 'Validates that the existing CI config is up to date with ' + help: + 'Validates that the existing CI config is up to date with ' 'the current configuration. Does not write any files.', ); } diff --git a/mono_repo/lib/src/commands/github/action_info.dart b/mono_repo/lib/src/commands/github/action_info.dart index 0f9eb1dd..916d5584 100644 --- a/mono_repo/lib/src/commands/github/action_info.dart +++ b/mono_repo/lib/src/commands/github/action_info.dart @@ -77,20 +77,20 @@ enum ActionInfo implements Comparable { } Job _coverageCompletionJob(RootConfig rootConfig) => Job( + name: 'Mark Coveralls job finished', + runsOn: 'ubuntu-latest', + steps: [ + ActionInfo.coveralls.usage( name: 'Mark Coveralls job finished', - runsOn: 'ubuntu-latest', - steps: [ - ActionInfo.coveralls.usage( - name: 'Mark Coveralls job finished', - withContent: { - // https://docs.github.com/en/actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow - 'github-token': r'${{ secrets.GITHUB_TOKEN }}', - 'parallel-finished': true, - }, - versionOverrides: rootConfig.existingActionVersions, - ), - ], - ); + withContent: { + // https://docs.github.com/en/actions/security-guides/automatic-token-authentication#using-the-github_token-in-a-workflow + 'github-token': r'${{ secrets.GITHUB_TOKEN }}', + 'parallel-finished': true, + }, + versionOverrides: rootConfig.existingActionVersions, + ), + ], +); /// Allows finding [ActionInfo] for a corresponding [Step]. final _actionInfoExpando = Expando(); diff --git a/mono_repo/lib/src/commands/github/generate.dart b/mono_repo/lib/src/commands/github/generate.dart index 605609ca..d8992268 100644 --- a/mono_repo/lib/src/commands/github/generate.dart +++ b/mono_repo/lib/src/commands/github/generate.dart @@ -17,26 +17,15 @@ const dependabotFileNames = [ '.github/dependabot.yml', ]; -void generateGitHubActions( - RootConfig rootConfig, { - bool validateOnly = false, -}) { - final githubConfig = _GeneratedGitHubConfig.generate( - rootConfig, - ); - final dependabotConfig = _GeneratedDependabotConfig.generate( - rootConfig, - ); +void generateGitHubActions(RootConfig rootConfig, {bool validateOnly = false}) { + final githubConfig = _GeneratedGitHubConfig.generate(rootConfig); + final dependabotConfig = _GeneratedDependabotConfig.generate(rootConfig); for (var entry in [ ...githubConfig.workflowFiles.entries, ...dependabotConfig.workflowFiles.entries, ]) { if (validateOnly) { - _validateFile( - rootConfig.rootDirectory, - entry.value, - entry.key, - ); + _validateFile(rootConfig.rootDirectory, entry.value, entry.key); } else { writeFile( rootConfig.rootDirectory, @@ -58,10 +47,7 @@ class _GeneratedDependabotConfig { final result = {}; final dependabotConfig = rootConfig.monoConfig.github.dependabot; if (dependabotConfig != null) { - final config = { - 'version': 2, - ...dependabotConfig, - }; + final config = {'version': 2, ...dependabotConfig}; final packageUpdates = rootConfig.map( (packageConfig) => { 'package-ecosystem': 'pub', @@ -75,7 +61,8 @@ class _GeneratedDependabotConfig { ...config['updates'] as List? ?? [], ...packageUpdates, ]; - result['.github/dependabot.yml'] = ''' + result['.github/dependabot.yml'] = + ''' $createdWith ${const JsonEncoder.withIndent(' ').convert(config)} '''; @@ -101,10 +88,10 @@ class _GeneratedGitHubConfig { /// the `--validate` option. class GithubConfigOutOfDateException extends UserException { GithubConfigOutOfDateException() - : super( - 'Generated github config is out of date', - details: 'Rerun `mono_repo generate` to update generated config', - ); + : super( + 'Generated github config is out of date', + details: 'Rerun `mono_repo generate` to update generated config', + ); } /// Checks [expectedPath] versus the content in [expectedContent]. diff --git a/mono_repo/lib/src/commands/github/github_yaml.dart b/mono_repo/lib/src/commands/github/github_yaml.dart index e461aa93..a91a5c06 100644 --- a/mono_repo/lib/src/commands/github/github_yaml.dart +++ b/mono_repo/lib/src/commands/github/github_yaml.dart @@ -22,16 +22,15 @@ const _onCompletionStage = '_on_completion'; const githubWorkflowDirectory = '.github/workflows'; -final defaultGitHubWorkflowFilePath = - githubWorkflowFilePath(defaultGitHubWorkflowFileName); +final defaultGitHubWorkflowFilePath = githubWorkflowFilePath( + defaultGitHubWorkflowFileName, +); String githubWorkflowFilePath(String filename) => '$githubWorkflowDirectory/$filename.yml'; Map generateGitHubYml(RootConfig rootConfig) { - final jobs = [ - ...rootConfig.expand((config) => config.jobs), - ]; + final jobs = [...rootConfig.expand((config) => config.jobs)]; final selfValidateStage = rootConfig.monoConfig.selfValidateStage; if (selfValidateStage != null) { @@ -118,8 +117,9 @@ Map generateGitHubYml(RootConfig rootConfig) { } } - final jobList = - Map.fromEntries(allJobs.map((e) => MapEntry(e.id, e.value))); + final jobList = Map.fromEntries( + allJobs.map((e) => MapEntry(e.id, e.value)), + ); for (var completion in completionMap.entries) { final job = completion.key.completionJobFactory!(rootConfig) @@ -128,7 +128,8 @@ Map generateGitHubYml(RootConfig rootConfig) { jobList['job_${jobList.length + 1}'] = job; } - output[githubWorkflowFilePath(fileName)] = ''' + output[githubWorkflowFilePath(fileName)] = + ''' $createdWith ${toYaml(rootConfig.monoConfig.github.generate(workflowName))} @@ -195,11 +196,7 @@ Iterable<_MapEntryWithStage> _listJobs( if (conditional != null) { content.ifContent = conditional.ifCondition; } - return _MapEntryWithStage( - jobName(++count), - content, - stage, - ); + return _MapEntryWithStage(jobName(++count), content, stage); } for (var job in jobs) { @@ -215,8 +212,9 @@ Iterable<_MapEntryWithStage> _listJobs( final commandsToKeys = extractCommands(rootConfig); - final commands = - ciJob.tasks.map((task) => commandsToKeys[task.command]!).toList(); + final commands = ciJob.tasks + .map((task) => commandsToKeys[task.command]!) + .toList(); jobEntries.add(CIJobEntry(ciJob, commands)); } @@ -248,17 +246,15 @@ Iterable<_MapEntryWithStage> _listJobs( ); yield jobEntry(yaml, first.job.stageName); } else { - yield* entry.value.map( - (e) { - final yaml = e._createJob( - rootConfig, - oneOs: differentOperatingSystems.length == 1, - oneSdk: differentSdks.length == 1, - onePackage: differentPackages.length == 1, - ); - return jobEntry(yaml, e.job.stageName); - }, - ); + yield* entry.value.map((e) { + final yaml = e._createJob( + rootConfig, + oneOs: differentOperatingSystems.length == 1, + oneSdk: differentSdks.length == 1, + onePackage: differentPackages.length == 1, + ); + return jobEntry(yaml, e.job.stageName); + }); } } @@ -266,10 +262,7 @@ Iterable<_MapEntryWithStage> _listJobs( // appropriate `needs` config to each. if (onCompletionJobs != null && onCompletionJobs.isNotEmpty) { for (var jobConfig in onCompletionJobs) { - yield jobEntry( - jobConfig, - _onCompletionStage, - ); + yield jobEntry(jobConfig, _onCompletionStage); } } } @@ -303,7 +296,8 @@ extension on CIJobEntry { final commandEntries = <_CommandEntry>[]; for (var package in packages) { - final pubStepId = '${package.replaceAll('/', '_')}_' + final pubStepId = + '${package.replaceAll('/', '_')}_' 'pub_${rootConfig.monoConfig.pubAction}'; commandEntries.add( _CommandEntry( @@ -390,37 +384,33 @@ Job _githubJob( RootConfig rootConfig, { required BasicConfiguration config, Map? additionalCacheKeys, -}) => - Job( - name: jobName, - runsOn: runsOn, - steps: [ - if (!runsOn.startsWith('windows')) - _cacheEntries( - runsOn, - rootConfig: rootConfig, - additionalCacheKeys: { - 'sdk': sdkVersion, - if (additionalCacheKeys != null) ...additionalCacheKeys, - }, - ), - packageFlavor.setupStep(sdkVersion, rootConfig), - ..._beforeSteps(runCommands.whereType<_CommandEntry>()), - ActionInfo.checkout.usage( - id: 'checkout', - versionOverrides: rootConfig.existingActionVersions, - ), - for (var command in runCommands) - ...command.runContent(config, rootConfig), - ], - ); +}) => Job( + name: jobName, + runsOn: runsOn, + steps: [ + if (!runsOn.startsWith('windows')) + _cacheEntries( + runsOn, + rootConfig: rootConfig, + additionalCacheKeys: { + 'sdk': sdkVersion, + if (additionalCacheKeys != null) ...additionalCacheKeys, + }, + ), + packageFlavor.setupStep(sdkVersion, rootConfig), + ..._beforeSteps(runCommands.whereType<_CommandEntry>()), + ActionInfo.checkout.usage( + id: 'checkout', + versionOverrides: rootConfig.existingActionVersions, + ), + for (var command in runCommands) ...command.runContent(config, rootConfig), + ], +); Set _orderedTypes(Iterable<_CommandEntry> commands) => SplayTreeSet.of(commands.map((e) => e.type).whereType()); -Iterable _beforeSteps( - Iterable<_CommandEntry> commands, -) sync* { +Iterable _beforeSteps(Iterable<_CommandEntry> commands) sync* { for (var type in _orderedTypes(commands)) { yield* type.beforeAllSteps; } @@ -542,11 +532,7 @@ class _MapEntryWithStage { final String stageName; - _MapEntryWithStage( - this.id, - this.value, - this.stageName, - ); + _MapEntryWithStage(this.id, this.value, this.stageName); } extension on PackageFlavor { diff --git a/mono_repo/lib/src/commands/github/job.dart b/mono_repo/lib/src/commands/github/job.dart index 911b9e56..31b891ff 100644 --- a/mono_repo/lib/src/commands/github/job.dart +++ b/mono_repo/lib/src/commands/github/job.dart @@ -9,10 +9,7 @@ import 'step.dart'; part 'job.g.dart'; -@JsonSerializable( - explicitToJson: true, - includeIfNull: false, -) +@JsonSerializable(explicitToJson: true, includeIfNull: false) class Job implements YamlLike { final String? name; @@ -24,11 +21,7 @@ class Job implements YamlLike { final List steps; List? needs; - Job({ - this.name, - this.runsOn, - required this.steps, - }); + Job({this.name, this.runsOn, required this.steps}); factory Job.fromJson(Map json) => _$JobFromJson(json); diff --git a/mono_repo/lib/src/commands/github/step.dart b/mono_repo/lib/src/commands/github/step.dart index e5a1533c..23a85154 100644 --- a/mono_repo/lib/src/commands/github/step.dart +++ b/mono_repo/lib/src/commands/github/step.dart @@ -8,11 +8,7 @@ import '../../yaml.dart'; part 'step.g.dart'; -@JsonSerializable( - explicitToJson: true, - includeIfNull: false, - constructor: '_', -) +@JsonSerializable(explicitToJson: true, includeIfNull: false, constructor: '_') class Step implements YamlLike { final String? id; final String? name; @@ -71,8 +67,8 @@ class Step implements YamlLike { this.ifContent, this.workingDirectory, this.env, - }) : uses = null, - withContent = null; + }) : uses = null, + withContent = null; Step.uses({ this.id, @@ -80,9 +76,9 @@ class Step implements YamlLike { required this.uses, this.withContent, this.ifContent, - }) : run = null, - env = null, - workingDirectory = null; + }) : run = null, + env = null, + workingDirectory = null; factory Step.fromJson(Map json) => _$StepFromJson(json); diff --git a/mono_repo/lib/src/commands/list_command.dart b/mono_repo/lib/src/commands/list_command.dart index d2b55ecb..6c68526c 100644 --- a/mono_repo/lib/src/commands/list_command.dart +++ b/mono_repo/lib/src/commands/list_command.dart @@ -13,7 +13,8 @@ class ListCommand extends MonoRepoCommand { ..addFlag( 'only-published', abbr: 'p', - help: 'Only list packages with a version and without publish_to set to ' + help: + 'Only list packages with a version and without publish_to set to ' 'none.', ) ..addMultiOption( @@ -37,17 +38,14 @@ class ListCommand extends MonoRepoCommand { @override void run() => print( - listPackages( - rootConfig(), - onlyPublished: argResults!['only-published'] as bool, - showItems: (argResults!['show'] as List) - .map( - (e) => - Column.values.singleWhere((element) => element.name == e), - ) - .toSet(), - ).join('\n'), - ); + listPackages( + rootConfig(), + onlyPublished: argResults!['only-published'] as bool, + showItems: (argResults!['show'] as List) + .map((e) => Column.values.singleWhere((element) => element.name == e)) + .toSet(), + ).join('\n'), + ); } enum Column { @@ -63,15 +61,9 @@ enum Column { help: 'The version of the package as specified in the "version" field.', defaultsTo: false, ), - publishTo( - help: 'The value of the "publish_to" field.', - defaultsTo: false, - ); + publishTo(help: 'The value of the "publish_to" field.', defaultsTo: false); - const Column({ - required this.help, - required this.defaultsTo, - }); + const Column({required this.help, required this.defaultsTo}); final String help; final bool defaultsTo; diff --git a/mono_repo/lib/src/commands/mono_repo_command.dart b/mono_repo/lib/src/commands/mono_repo_command.dart index 602006b8..f83d308b 100644 --- a/mono_repo/lib/src/commands/mono_repo_command.dart +++ b/mono_repo/lib/src/commands/mono_repo_command.dart @@ -11,7 +11,7 @@ const recursiveFlag = 'recursive'; abstract class MonoRepoCommand extends Command { RootConfig rootConfig() => RootConfig( - rootDirectory: p.current, - recursive: globalResults![recursiveFlag] as bool, - ); + rootDirectory: p.current, + recursive: globalResults![recursiveFlag] as bool, + ); } diff --git a/mono_repo/lib/src/commands/presubmit.dart b/mono_repo/lib/src/commands/presubmit.dart index 412d2764..f04057f8 100644 --- a/mono_repo/lib/src/commands/presubmit.dart +++ b/mono_repo/lib/src/commands/presubmit.dart @@ -63,8 +63,8 @@ class PresubmitCommand extends MonoRepoCommand { /// This also won't match any exact versions listed in your travis config. final _currentSdk = Version.parse(Platform.version.split(' ').first).isPreRelease - ? 'dev' - : 'stable'; + ? 'dev' + : 'stable'; Future presubmit( RootConfig rootConfig, { @@ -79,8 +79,9 @@ Future presubmit( if (!File(ciScriptPath).existsSync()) { throw UserException( - 'No $ciScriptPath file found, please run the `generate` command ' - 'first.'); + 'No $ciScriptPath file found, please run the `generate` command ' + 'first.', + ); } final commandsToKeys = extractCommands(rootConfig); @@ -99,14 +100,16 @@ Future presubmit( ), ); if (tasks.isEmpty) tasks = allKnownTasks; - final unrecognizedTasks = - tasks.where((task) => !allKnownTasks.contains(task)); + final unrecognizedTasks = tasks.where( + (task) => !allKnownTasks.contains(task), + ); if (unrecognizedTasks.isNotEmpty) { throw UserException( - 'Found ${unrecognizedTasks.length} unrecognized tasks:\n' - '${unrecognizedTasks.map((task) => ' $task').join('\n')}\n\n' - 'Known tasks are:\n' - '${allKnownTasks.map((task) => ' $task').join('\n')}'); + 'Found ${unrecognizedTasks.length} unrecognized tasks:\n' + '${unrecognizedTasks.map((task) => ' $task').join('\n')}\n\n' + 'Known tasks are:\n' + '${allKnownTasks.map((task) => ' $task').join('\n')}', + ); } // Status of the presubmit. @@ -116,8 +119,9 @@ Future presubmit( (pkg) => pkg.relativePath == package, orElse: () { throw UserException( - 'Unrecognized package `$package`, known packages are:\n' - '${rootConfig.map((pkg) => ' ${pkg.relativePath}').join('\n')}'); + 'Unrecognized package `$package`, known packages are:\n' + '${rootConfig.map((pkg) => ' ${pkg.relativePath}').join('\n')}', + ); }, ); @@ -129,8 +133,10 @@ Future presubmit( // Skip tasks that weren't specified if (!tasks.contains(task.type.name)) continue; - print(' SDK: ${styleBold.wrap(white.wrap(job.sdk))} ' - 'TASK: ${styleBold.wrap(white.wrap(task.command))}'); + print( + ' SDK: ${styleBold.wrap(white.wrap(job.sdk))} ' + 'TASK: ${styleBold.wrap(white.wrap(task.command))}', + ); if (sdk != sdkToRun) { print(yellow.wrap(' skipped, mismatched sdk')); continue; @@ -145,8 +151,9 @@ Future presubmit( print(green.wrap(' success')); } else { tmpDir ??= Directory.systemTemp.createTempSync('mono_repo_'); - final file = - File(p.join(tmpDir.path, '${package}_${taskKey}_${job.sdk}.txt')); + final file = File( + p.join(tmpDir.path, '${package}_${taskKey}_${job.sdk}.txt'), + ); await file.create(recursive: true); await file.writeAsString(result.stdout as String); print(red.wrap(' failure, ${file.path}')); diff --git a/mono_repo/lib/src/commands/readme_command.dart b/mono_repo/lib/src/commands/readme_command.dart index a1011def..7ec7a295 100644 --- a/mono_repo/lib/src/commands/readme_command.dart +++ b/mono_repo/lib/src/commands/readme_command.dart @@ -13,12 +13,14 @@ class ReadmeCommand extends MonoRepoCommand { ..addFlag( 'only-published', abbr: 'p', - help: 'Only list packages with a version and without publish_to set to ' + help: + 'Only list packages with a version and without publish_to set to ' 'none.', ) ..addFlag( 'pad', - help: 'Pad table contents so cells in the same column are the same ' + help: + 'Pad table contents so cells in the same column are the same ' 'width.', ); } @@ -32,12 +34,12 @@ class ReadmeCommand extends MonoRepoCommand { @override void run() => print( - readme( - rootConfig(), - onlyPublished: argResults!['only-published'] as bool, - pad: argResults!['pad'] as bool, - ), - ); + readme( + rootConfig(), + onlyPublished: argResults!['only-published'] as bool, + pad: argResults!['pad'] as bool, + ), + ); } String readme( diff --git a/mono_repo/lib/src/github_config.dart b/mono_repo/lib/src/github_config.dart index 4429e4ad..3a7e8f0f 100644 --- a/mono_repo/lib/src/github_config.dart +++ b/mono_repo/lib/src/github_config.dart @@ -99,10 +99,11 @@ class GitHubConfig { for (var jobConfig in onCompletion!) { if (jobConfig.needs != null) { throw ArgumentError.value( - jobConfig, - 'on_completion', - 'Cannot define a `needs` key for `on_completion` jobs, this is ' - 'filled in for you to depend on all jobs.'); + jobConfig, + 'on_completion', + 'Cannot define a `needs` key for `on_completion` jobs, this is ' + 'filled in for you to depend on all jobs.', + ); } } } @@ -110,15 +111,15 @@ class GitHubConfig { factory GitHubConfig.fromJson(Map json) => _$GitHubConfigFromJson(json); Map generate(String workflowName) => { - 'name': workflowName, - if (on != null) 'on': on, - 'defaults': { - 'run': {'shell': 'bash'}, - }, - 'env': {'PUB_ENVIRONMENT': 'bot.github', ...?env}, - // Declare default permissions as read only. - 'permissions': 'read-all', - }; + 'name': workflowName, + if (on != null) 'on': on, + 'defaults': { + 'run': {'shell': 'bash'}, + }, + 'env': {'PUB_ENVIRONMENT': 'bot.github', ...?env}, + // Declare default permissions as read only. + 'permissions': 'read-all', + }; } @JsonSerializable(createToJson: false, disallowUnrecognizedKeys: true) @@ -171,10 +172,7 @@ Map _parseOn(Map? on, String? cron) { const _defaultOn = { 'push': { - 'branches': [ - 'main', - 'master', - ], + 'branches': ['main', 'master'], }, // A `null` value here means all pull requests are processed by this workflow. 'pull_request': null, diff --git a/mono_repo/lib/src/mono_config.dart b/mono_repo/lib/src/mono_config.dart index 267844ef..a662023c 100644 --- a/mono_repo/lib/src/mono_config.dart +++ b/mono_repo/lib/src/mono_config.dart @@ -25,10 +25,7 @@ const _allowedMonoConfigKeys = { const _defaultPubAction = 'upgrade'; -const _allowedPubActions = { - 'get', - _defaultPubAction, -}; +const _allowedPubActions = {'get', _defaultPubAction}; class MonoConfig implements BasicConfiguration { final Map githubConditionalStages; @@ -47,12 +44,13 @@ class MonoConfig implements BasicConfiguration { required this.selfValidateStage, required Map github, required this.coverageProcessors, - }) : githubConditionalStages = _readConditionalStages(github), - github = GitHubConfig.fromJson(github); + }) : githubConditionalStages = _readConditionalStages(github), + github = GitHubConfig.fromJson(github); factory MonoConfig.fromJson(Map json) { - final unsupportedKeys = - json.keys.where((k) => !_allowedMonoConfigKeys.contains(k)).toList(); + final unsupportedKeys = json.keys + .where((k) => !_allowedMonoConfigKeys.contains(k)) + .toList(); if (unsupportedKeys.isNotEmpty) { throw CheckedFromJsonException( @@ -64,9 +62,7 @@ class MonoConfig implements BasicConfiguration { ); } - final ci = { - if (json.containsKey('github')) CI.github, - }; + final ci = {if (json.containsKey('github')) CI.github}; Map parseCI(CI targetCI) { final key = targetCI.toString().split('.').last; @@ -230,10 +226,7 @@ String? _selfValidateFromValue(Object? value) { throw ArgumentError.value(value, 'value', 'Must be a `String` or `bool`.'); } -@JsonSerializable( - createToJson: false, - disallowUnrecognizedKeys: true, -) +@JsonSerializable(createToJson: false, disallowUnrecognizedKeys: true) class ConditionalStage { @JsonKey(required: true, disallowNullValue: true) final String name; @@ -252,6 +245,4 @@ class ConditionalStage { } // The available CI providers that we generate config for. -enum CI { - github, -} +enum CI { github } diff --git a/mono_repo/lib/src/package_config.dart b/mono_repo/lib/src/package_config.dart index d6d50c11..553d4b4d 100644 --- a/mono_repo/lib/src/package_config.dart +++ b/mono_repo/lib/src/package_config.dart @@ -42,23 +42,18 @@ class PackageConfig { this.dartSdkConfigUsed, this.osConfigUsed, ) : assert(() { - if (sdks == null) return true; - sortNormalizeVerifySdksList( - pubspec.flavor, - sdks, - AssertionError.new, - ); - return true; - }()); + if (sdks == null) return true; + sortNormalizeVerifySdksList(pubspec.flavor, sdks, AssertionError.new); + return true; + }()); factory PackageConfig.parse( String relativePath, Pubspec pubspec, Map monoPkgYaml, - ) => - createWithCheck( - () => PackageConfig._parse(relativePath, pubspec, monoPkgYaml), - ); + ) => createWithCheck( + () => PackageConfig._parse(relativePath, pubspec, monoPkgYaml), + ); factory PackageConfig._parse( String relativePath, @@ -157,8 +152,10 @@ class PackageConfig { osConfigUsed = true; } - final (:description, :tasks) = - CIJob.parse(job as Object, flavor: flavor); + final (:description, :tasks) = CIJob.parse( + job as Object, + flavor: flavor, + ); for (var sdk in jobSdks) { for (var os in jobOses) { jobs.add( @@ -236,11 +233,7 @@ class CIJob implements HasStageName { List get groupByKeys => [os, stageName, sdk]; /// Values used to sort jobs within a group. - String get sortBits => [ - ...groupByKeys, - package, - name, - ].join(':::'); + String get sortBits => [...groupByKeys, package, name].join(':::'); CIJob( this.os, @@ -251,9 +244,9 @@ class CIJob implements HasStageName { this.description, required this.flavor, }) : assert( - errorForSdkConfig(flavor, sdk) == null, - 'Should have caught bad sdk value `$sdk` before here!', - ); + errorForSdkConfig(flavor, sdk) == null, + 'Should have caught bad sdk value `$sdk` before here!', + ); static ({String? description, List tasks}) parse( Object yaml, { @@ -268,10 +261,7 @@ class CIJob implements HasStageName { withoutDescription = yaml; } final tasks = Task.parseTaskOrGroup(flavor, withoutDescription); - return ( - tasks: tasks, - description: description, - ); + return (tasks: tasks, description: description); } /// If [sdk] is a valid [Version], return it. Otherwise, `null`. @@ -305,7 +295,7 @@ class Task { final String command; Task(this.flavor, this.type, {this.args}) - : command = type.commandValue(flavor, args).join(' '); + : command = type.commandValue(flavor, args).join(' '); /// Parses an individual item under `stages`, which might be a `group` or an /// individual task. @@ -408,12 +398,7 @@ class Task { try { return Task(flavor, taskType, args: args); } on InvalidTaskConfigException catch (e) { - throw CheckedFromJsonException( - yamlValue, - taskName, - 'Task', - e.message, - ); + throw CheckedFromJsonException(yamlValue, taskName, 'Task', e.message); } } diff --git a/mono_repo/lib/src/raw_config.dart b/mono_repo/lib/src/raw_config.dart index de71c062..36fe6d64 100644 --- a/mono_repo/lib/src/raw_config.dart +++ b/mono_repo/lib/src/raw_config.dart @@ -24,15 +24,12 @@ class RawConfig { final RawCache? cache; - RawConfig({ - required this.oses, - this.sdks, - List? stages, - this.cache, - }) : stages = stages ?? - [ - RawStage('unit_test', ['test']), - ] { + RawConfig({required this.oses, this.sdks, List? stages, this.cache}) + : stages = + stages ?? + [ + RawStage('unit_test', ['test']), + ] { if (sdks != null) { sortNormalizeVerifySdksList( Zone.current[_flavorKey] as PackageFlavor, diff --git a/mono_repo/lib/src/root_config.dart b/mono_repo/lib/src/root_config.dart index 6b0d2169..624589b9 100644 --- a/mono_repo/lib/src/root_config.dart +++ b/mono_repo/lib/src/root_config.dart @@ -23,8 +23,11 @@ PackageConfig? _packageConfigFromDir( String rootDirectory, String pkgRelativePath, ) { - final legacyConfigPath = - p.join(rootDirectory, pkgRelativePath, _legacyPkgConfigFileName); + final legacyConfigPath = p.join( + rootDirectory, + pkgRelativePath, + _legacyPkgConfigFileName, + ); if (FileSystemEntity.isFileSync(legacyConfigPath)) { throw UserException( 'Found legacy package configuration file ' @@ -41,8 +44,9 @@ PackageConfig? _packageConfigFromDir( return null; } - final pubspecFile = - File(p.join(rootDirectory, pkgRelativePath, _pubspecFileName)); + final pubspecFile = File( + p.join(rootDirectory, pkgRelativePath, _pubspecFileName), + ); if (!pubspecFile.existsSync()) { throw UserException( @@ -76,8 +80,10 @@ class RootConfig extends ListBase { for (var subdir in dirs) { final relativeSubDirPath = p.relative(subdir.path, from: rootDirectory); - final pkgConfig = - _packageConfigFromDir(rootDirectory!, relativeSubDirPath); + final pkgConfig = _packageConfigFromDir( + rootDirectory!, + relativeSubDirPath, + ); if (pkgConfig != null) { configs.add(pkgConfig); } @@ -93,7 +99,8 @@ class RootConfig extends ListBase { if (configs.isEmpty) { throw UserException( 'No packages found.', - details: 'Each target package directory must contain ' + details: + 'Each target package directory must contain ' 'a `$monoPkgFileName` file.', ); } @@ -105,8 +112,9 @@ class RootConfig extends ListBase { final hasDependabot = dependabotFileNames .map((name) => File(p.join(rootDirectory!, name))) .any((file) => file.existsSync()); - final githubWorkflowFile = - File(p.join(rootDirectory, defaultGitHubWorkflowFilePath)); + final githubWorkflowFile = File( + p.join(rootDirectory, defaultGitHubWorkflowFilePath), + ); if (hasDependabot && githubWorkflowFile.existsSync()) { existingActionVersions = parseActionVersions( githubWorkflowFile.readAsStringSync(), diff --git a/mono_repo/lib/src/runner.dart b/mono_repo/lib/src/runner.dart index 6cb3ddaf..9bd35cd0 100644 --- a/mono_repo/lib/src/runner.dart +++ b/mono_repo/lib/src/runner.dart @@ -17,24 +17,19 @@ import 'commands/pub.dart'; import 'commands/readme_command.dart'; import 'version.dart'; -final commands = List>.unmodifiable( - [ - CheckCommand(), - DartCommand(), - GenerateCommand(), - ListCommand(), - PresubmitCommand(), - PubCommand(), - ReadmeCommand(), - ], -); +final commands = List>.unmodifiable([ + CheckCommand(), + DartCommand(), + GenerateCommand(), + ListCommand(), + PresubmitCommand(), + PubCommand(), + ReadmeCommand(), +]); class MonoRepoRunner extends CommandRunner { MonoRepoRunner() - : super( - 'mono_repo', - 'Manage multiple packages in one source repository.', - ) { + : super('mono_repo', 'Manage multiple packages in one source repository.') { commands.forEach(addCommand); argParser ..addFlag( diff --git a/mono_repo/lib/src/task_type.dart b/mono_repo/lib/src/task_type.dart index c4aad339..230a082a 100644 --- a/mono_repo/lib/src/task_type.dart +++ b/mono_repo/lib/src/task_type.dart @@ -42,8 +42,7 @@ abstract class TaskType implements Comparable { String packageDirectory, BasicConfiguration config, RootConfig rootConfig, - ) => - const Iterable.empty(); + ) => const Iterable.empty(); static Iterable get allowedTaskNames sync* { for (var val in TaskType._values) { @@ -52,13 +51,13 @@ abstract class TaskType implements Comparable { } } - static final prettyTaskList = - TaskType._values.map((t) => '`${t.name}`').join(', '); + static final prettyTaskList = TaskType._values + .map((t) => '`${t.name}`') + .join(', '); static TaskType taskFromName(String input) => TaskType._values.singleWhere( - (element) => - element.name == input || element.alternates.contains(input), - ); + (element) => element.name == input || element.alternates.contains(input), + ); } /// Special [Exception] type used to convey error state that can be caught and @@ -74,11 +73,11 @@ class _FormatTask extends TaskType { @override List commandValue(PackageFlavor flavor, String? args) => [ - 'dart format', - (args == null || args == 'sdk') - ? '--output=none --set-exit-if-changed .' - : args, - ]; + 'dart format', + (args == null || args == 'sdk') + ? '--output=none --set-exit-if-changed .' + : args, + ]; @override Iterable get alternates => const {'dartfmt'}; @@ -89,9 +88,9 @@ class _AnalyzeTask extends TaskType { @override List commandValue(PackageFlavor flavor, String? args) => [ - flavor == PackageFlavor.dart ? 'dart analyze' : 'flutter analyze', - if (args != null) args, - ]; + flavor == PackageFlavor.dart ? 'dart analyze' : 'flutter analyze', + if (args != null) args, + ]; @override Iterable get alternates => const {'dartanalyzer'}; @@ -102,9 +101,9 @@ class _TestTask extends TaskType { @override List commandValue(PackageFlavor flavor, String? args) => [ - flavor == PackageFlavor.dart ? 'dart test' : 'flutter test', - if (args != null) args, - ]; + flavor == PackageFlavor.dart ? 'dart test' : 'flutter test', + if (args != null) args, + ]; } class _CommandTask extends TaskType { @@ -138,13 +137,13 @@ class _TestWithCoverageTask extends TaskType { @override Iterable get beforeAllSteps => [ - Step.run( - name: 'Activate package:coverage', - // Requiring the latest version of pkg:coverage as the when this - // feature was added. - run: "dart pub global activate coverage '>=1.5.0'", - ), - ]; + Step.run( + name: 'Activate package:coverage', + // Requiring the latest version of pkg:coverage as the when this + // feature was added. + run: "dart pub global activate coverage '>=1.5.0'", + ), + ]; @override Iterable afterEachSteps( diff --git a/mono_repo/lib/src/utilities.dart b/mono_repo/lib/src/utilities.dart index 73b9a378..3a825205 100644 --- a/mono_repo/lib/src/utilities.dart +++ b/mono_repo/lib/src/utilities.dart @@ -104,11 +104,7 @@ void sortNormalizeVerifySdksList( } } -const _supportedFlutterSdkLiterals = { - 'master', - 'beta', - 'stable', -}; +const _supportedFlutterSdkLiterals = {'master', 'beta', 'stable'}; const _supportedDartSdkLiterals = { _githubSetupMainSdk, @@ -124,11 +120,13 @@ const _allowedMainVersions = { _githubSetupMainSdk, }; -final _dartSdkLiteralsPretty = - _supportedDartSdkLiterals.map((e) => '"$e"').join(', '); +final _dartSdkLiteralsPretty = _supportedDartSdkLiterals + .map((e) => '"$e"') + .join(', '); -final _flutterLiteralsPretty = - _supportedFlutterSdkLiterals.map((e) => '"$e"').join(', '); +final _flutterLiteralsPretty = _supportedFlutterSdkLiterals + .map((e) => '"$e"') + .join(', '); extension PubspecExtension on Pubspec { PackageFlavor get flavor => diff --git a/mono_repo/lib/src/yaml.dart b/mono_repo/lib/src/yaml.dart index aa3167db..6ea5ac80 100644 --- a/mono_repo/lib/src/yaml.dart +++ b/mono_repo/lib/src/yaml.dart @@ -130,10 +130,12 @@ String _escapeString(String source) { !_yamlSpecialStrings.contains(source.toLowerCase())) { return source; } - final output = source.replaceAllMapped(_escapeRegExp, (match) { - final value = match[0]!; - return _escapeMap[value] ?? _getHexLiteral(value); - }).replaceAll('"', r'\"'); + final output = source + .replaceAllMapped(_escapeRegExp, (match) { + final value = match[0]!; + return _escapeMap[value] ?? _getHexLiteral(value); + }) + .replaceAll('"', r'\"'); return '"$output"'; } @@ -280,8 +282,9 @@ final _yamlIndicators = { '`', }.map(RegExp.escape).join(); -final _simpleString = - RegExp('^[^${_yamlIndicators}0-9"~][^$_yamlIndicators]*\$'); +final _simpleString = RegExp( + '^[^${_yamlIndicators}0-9"~][^$_yamlIndicators]*\$', +); final _maybeNumber = RegExp(r'\+?\.?\d'); diff --git a/mono_repo/test/action_versions_test.dart b/mono_repo/test/action_versions_test.dart index ed4a0419..bbb98753 100644 --- a/mono_repo/test/action_versions_test.dart +++ b/mono_repo/test/action_versions_test.dart @@ -13,10 +13,10 @@ import 'package:test/test.dart'; void main() { test('action versions are up to date', () { - final result = Process.runSync( - Platform.executable, - ['tool/generate_action_versions.dart', '--validate'], - ); + final result = Process.runSync(Platform.executable, [ + 'tool/generate_action_versions.dart', + '--validate', + ]); expect(result.exitCode, 0, reason: result.stdout as String); }); } diff --git a/mono_repo/test/check_comand_test.dart b/mono_repo/test/check_comand_test.dart index 87e96b91..582e3fa6 100644 --- a/mono_repo/test/check_comand_test.dart +++ b/mono_repo/test/check_comand_test.dart @@ -29,10 +29,13 @@ void main() { test('check', () { final reports = getPackageReports(RootConfig(rootDirectory: d.sandbox)); - expect( - reports.keys, - ['bar', 'baz', p.join('baz', 'recursive'), 'flutter', 'foo'], - ); + expect(reports.keys, [ + 'bar', + 'baz', + p.join('baz', 'recursive'), + 'flutter', + 'foo', + ]); final fooReport = reports['foo']!; expect(fooReport.packageName, 'foo'); diff --git a/mono_repo/test/dart_command_test.dart b/mono_repo/test/dart_command_test.dart index 323581f2..e7816c74 100644 --- a/mono_repo/test/dart_command_test.dart +++ b/mono_repo/test/dart_command_test.dart @@ -14,11 +14,10 @@ void main() { test('can run pub get', () async { expect( - () => dart( - RootConfig(rootDirectory: d.sandbox), - ['pub', 'get'], - PubCommand().executableForPackage, - ), + () => dart(RootConfig(rootDirectory: d.sandbox), [ + 'pub', + 'get', + ], PubCommand().executableForPackage), prints(allOf(contains('success!'), isNot(contains('Failures:')))), ); }); @@ -31,11 +30,10 @@ import 'a.dart'; '''); addTearDown(() => file.deleteSync); await expectLater( - () => dart( - RootConfig(rootDirectory: d.sandbox), - ['fix', '--apply'], - (_) => Executable.dart, - ), + () => dart(RootConfig(rootDirectory: d.sandbox), [ + 'fix', + '--apply', + ], (_) => Executable.dart), prints(allOf(contains('success!'), isNot(contains('Failures:')))), ); expect(file.readAsStringSync(), ''' diff --git a/mono_repo/test/generate_test.dart b/mono_repo/test/generate_test.dart index 9f7acb2d..ffb1f00e 100644 --- a/mono_repo/test/generate_test.dart +++ b/mono_repo/test/generate_test.dart @@ -35,9 +35,7 @@ void main() { 'Wrote `${p.join(d.sandbox, defaultGitHubWorkflowFilePath)}`.', ciScriptPathMessage, ].join('\n'); - testGenerateConfig( - printMatcher: expected, - ); + testGenerateConfig(printMatcher: expected); }); } }); @@ -49,7 +47,8 @@ void main() { testGenerateConfig, throwsUserExceptionWith( 'No packages found.', - details: 'Each target package directory must contain a ' + details: + 'Each target package directory must contain a ' '`mono_pkg.yaml` file.', ), ); @@ -161,7 +160,7 @@ name: pkg_name 'stages': [ { 'unit_test': ['test'], - } + }, ], }), ), @@ -190,12 +189,9 @@ name: pkg_name 'stages': [ { 'unit_test': [ - { - 'test': '', - 'sdk': values, - } + {'test': '', 'sdk': values}, ], - } + }, ], }), ), @@ -285,12 +281,10 @@ package:pkg_b''', group('--validate', () { setUp(() async { - await populateConfig( - r''' + await populateConfig(r''' github: dependabot: {} -''', - ); +'''); }); test('throws if there is no generated config', () async { @@ -320,30 +314,26 @@ github: ); // Just check that this doesn't throw. - testGenerateConfig( - printMatcher: 'package:sub_pkg', - validateOnly: true, - ); + testGenerateConfig(printMatcher: 'package:sub_pkg', validateOnly: true); }); - test("doesn't throw if the previous config has different action versions", - () async { - testGenerateConfig( - printMatcher: _subPkgStandardOutput(withDependabot: true), - ); - final generatedFile = File(d.path(defaultGitHubWorkflowFilePath)); - final contents = generatedFile.readAsStringSync(); - generatedFile.writeAsStringSync( - contents.replaceAll( - 'dart-lang/setup-dart@', - 'dart-lang/setup-dart@Foo', - ), - ); - testGenerateConfig( - printMatcher: 'package:sub_pkg', - validateOnly: true, - ); - }); + test( + "doesn't throw if the previous config has different action versions", + () async { + testGenerateConfig( + printMatcher: _subPkgStandardOutput(withDependabot: true), + ); + final generatedFile = File(d.path(defaultGitHubWorkflowFilePath)); + final contents = generatedFile.readAsStringSync(); + generatedFile.writeAsStringSync( + contents.replaceAll( + 'dart-lang/setup-dart@', + 'dart-lang/setup-dart@Foo', + ), + ); + testGenerateConfig(printMatcher: 'package:sub_pkg', validateOnly: true); + }, + ); }); test('complete travis.yml file', () async { @@ -354,9 +344,7 @@ name: pkg_name '''), ]).create(); - testGenerateConfig( - printMatcher: _subPkgStandardOutput(), - ); + testGenerateConfig(printMatcher: _subPkgStandardOutput()); await d.file(ciScriptPath, ciShellOutput).validate(); }); @@ -386,7 +374,8 @@ ${_writeScriptOutput(false)}''', }); await populateConfig(monoConfigContent); - String pkgName(int i) => 'package_with_a_long_name_' + String pkgName(int i) => + 'package_with_a_long_name_' '${i.toString().padLeft(2, '0')}'; const count = 18; @@ -408,16 +397,14 @@ name: pkg_a } testGenerateConfig( - printMatcher: ''' + printMatcher: + ''' ${Iterable.generate(count, (i) => 'package:${pkgName(i)}').join('\n')} package:sub_pkg ${_writeScriptOutput(false)}''', ); - validateSandbox( - 'max_cache_key.txt', - defaultGitHubWorkflowFilePath, - ); + validateSandbox('max_cache_key.txt', defaultGitHubWorkflowFilePath); }); test('two flavors of dartfmt', () async { @@ -467,10 +454,7 @@ package:pkg_b ${_writeScriptOutput(false)}''', ); - validateSandbox( - 'two_dartfmt_flavors.txt', - defaultGitHubWorkflowFilePath, - ); + validateSandbox('two_dartfmt_flavors.txt', defaultGitHubWorkflowFilePath); await d .file( @@ -589,10 +573,11 @@ line 3, column 7 of ${p.normalize('pkg_a/mono_pkg.yaml')}: An "sdk" key is requi ); }); - test('top-level `dart` and `os` key values are a no-op with group overrides', - () async { - await d.dir('pkg_a', [ - d.file(monoPkgFileName, r''' + test( + 'top-level `dart` and `os` key values are a no-op with group overrides', + () async { + await d.dir('pkg_a', [ + d.file(monoPkgFileName, r''' sdk: - stable os: @@ -621,26 +606,27 @@ stages: sdk: stable os: linux '''), - d.file('pubspec.yaml', ''' + d.file('pubspec.yaml', ''' name: pkg_a '''), - ]).create(); + ]).create(); - testGenerateConfig( - printMatcher: ''' + testGenerateConfig( + printMatcher: ''' package:pkg_a `dart` values (stable) are not used and can be removed. `os` values (unneeded) are not used and can be removed. ${_writeScriptOutput(false)}''', - ); + ); - validateSandbox( - 'github_output_group_overrides.txt', - defaultGitHubWorkflowFilePath, - ); + validateSandbox( + 'github_output_group_overrides.txt', + defaultGitHubWorkflowFilePath, + ); - await d.file(ciScriptPath, ciShellOutput).validate(); - }); + await d.file(ciScriptPath, ciShellOutput).validate(); + }, + ); test('test_with_coverage', () async { await d.dir('pkg_a', [ @@ -777,13 +763,7 @@ $lines testGenerateConfig(printMatcher: isNotEmpty); await d - .file( - ciScriptPath, - stringContainsInOrder([ - 'test_00)', - 'test_10)', - ]), - ) + .file(ciScriptPath, stringContainsInOrder(['test_00)', 'test_10)'])) .validate(); }); @@ -799,9 +779,7 @@ $lines } await d.nothing(ciScriptPath).validate(); - testGenerateConfig( - printMatcher: _subPkgStandardOutput(), - ); + testGenerateConfig(printMatcher: _subPkgStandardOutput()); if (expectedGithubContent != null) { await d @@ -953,24 +931,28 @@ ${_writeScriptOutput(false)}''', group('pub_action', () { test( 'value must be a String', - () => _testBadConfig({ - 'pub_action': 42, - }, r''' + () => _testBadConfig( + {'pub_action': 42}, + r''' line 1, column 13 of mono_repo.yaml: Unsupported value for "pub_action". Value must be one of: `get`, `upgrade`. ╷ 1 │ pub_action: 42 │ ^^ - ╵'''), + ╵''', + ), ); test( 'value must be in allowed list', - () => _testBadConfig({'pub_action': 'bob'}, r''' + () => _testBadConfig( + {'pub_action': 'bob'}, + r''' line 1, column 13 of mono_repo.yaml: Unsupported value for "pub_action". Value must be one of: `get`, `upgrade`. ╷ 1 │ pub_action: bob │ ^^^ - ╵'''), + ╵''', + ), ); test('upgrade', () async { @@ -978,9 +960,7 @@ line 1, column 13 of mono_repo.yaml: Unsupported value for "pub_action". Value m await populateConfig(monoConfigContent); - testGenerateConfig( - printMatcher: _subPkgStandardOutput(), - ); + testGenerateConfig(printMatcher: _subPkgStandardOutput()); // TODO: validate GitHub case await d.file(ciScriptPath, ciShellOutput).validate(); @@ -991,9 +971,7 @@ line 1, column 13 of mono_repo.yaml: Unsupported value for "pub_action". Value m await populateConfig(monoConfigContent); - testGenerateConfig( - printMatcher: _subPkgStandardOutput(), - ); + testGenerateConfig(printMatcher: _subPkgStandardOutput()); // TODO: validate GitHub case await d @@ -1015,29 +993,30 @@ line 1, column 13 of mono_repo.yaml: Unsupported value for "pub_action". Value m group('pretty_ansi', () { test( 'value must be bool', - () => _testBadConfig({'pretty_ansi': 'not a bool!'}, r''' + () => _testBadConfig( + {'pretty_ansi': 'not a bool!'}, + r''' line 1, column 14 of mono_repo.yaml: Unsupported value for "pretty_ansi". Value must be `true` or `false`. ╷ 1 │ pretty_ansi: "not a bool!" │ ^^^^^^^^^^^^^ - ╵'''), + ╵''', + ), ); test('set to false', () async { await populateConfig(toYaml({'pretty_ansi': false})); - testGenerateConfig( - printMatcher: _subPkgStandardOutput(), - ); + testGenerateConfig(printMatcher: _subPkgStandardOutput()); await d .file( - ciScriptPath, - ''' + ciScriptPath, + ''' $bashScriptHeader ''' - r''' + r''' if [[ -z ${PKGS} ]]; then echo -e 'PKGS environment variable must be set! - TERMINATING JOB' exit 64 @@ -1122,7 +1101,8 @@ done if [ ${#FAILURES[@]} -ne 0 ]; then exit 1 fi -''') +''', + ) .validate(); }); }); @@ -1130,12 +1110,15 @@ fi group('self_validate', () { test( 'value must be bool or string', - () => _testBadConfig({'self_validate': 42}, r''' + () => _testBadConfig( + {'self_validate': 42}, + r''' line 1, column 16 of mono_repo.yaml: Unsupported value for "self_validate". Value must be `true`, `false`, or a stage name. ╷ 1 │ self_validate: 42 │ ^^ - ╵'''), + ╵''', + ), ); test('set to `true`', () async { @@ -1143,9 +1126,7 @@ line 1, column 16 of mono_repo.yaml: Unsupported value for "self_validate". Valu await populateConfig(monoConfigContent); - testGenerateConfig( - printMatcher: _subPkgStandardOutput(), - ); + testGenerateConfig(printMatcher: _subPkgStandardOutput()); validateSandbox( 'self_validate_set_to_true.txt', @@ -1160,9 +1141,7 @@ line 1, column 16 of mono_repo.yaml: Unsupported value for "self_validate". Valu await populateConfig(monoConfigContent); - testGenerateConfig( - printMatcher: _subPkgStandardOutput(), - ); + testGenerateConfig(printMatcher: _subPkgStandardOutput()); validateSandbox( 'self_validate_set_to_a_stage_name.txt', @@ -1192,9 +1171,7 @@ env: group('pubspec version', () { test('valid', () async { await d.dir('pkg_a', [ - d.file( - monoPkgFileName, - r''' + d.file(monoPkgFileName, r''' sdk: - pubspec - dev @@ -1216,8 +1193,7 @@ stages: os: - linux - windows -''', - ), +'''), d.file('pubspec.yaml', ''' name: pkg_a environment: @@ -1239,9 +1215,7 @@ ${_writeScriptOutput(false)}''', test('no SDK constraint - with top-level `pubspec` usage', () async { await d.dir('pkg_a', [ - d.file( - monoPkgFileName, - r''' + d.file(monoPkgFileName, r''' sdk: - pubspec - dev @@ -1249,8 +1223,7 @@ sdk: stages: - analyze_and_format: - analyze: --fatal-infos . -''', - ), +'''), d.file('pubspec.yaml', ''' name: pkg_a '''), @@ -1270,15 +1243,12 @@ line 2, column 1 of ${p.join('pkg_a', 'mono_pkg.yaml')}: Unsupported value for " test('no SDK constraint - with job `pubspec` usage', () async { await d.dir('pkg_a', [ - d.file( - monoPkgFileName, - r''' + d.file(monoPkgFileName, r''' stages: - analyze_and_format: - analyze: --fatal-infos . sdk: pubspec -''', - ), +'''), d.file('pubspec.yaml', ''' name: pkg_a '''), @@ -1297,15 +1267,12 @@ line 4, column 10 of ${p.join('pkg_a', 'mono_pkg.yaml')}: Unsupported value for test('not supported with flutter', () async { await d.dir('pkg_a', [ - d.file( - monoPkgFileName, - r''' + d.file(monoPkgFileName, r''' stages: - analyze_and_format: - analyze: --fatal-infos . sdk: pubspec -''', - ), +'''), d.file('pubspec.yaml', ''' name: pkg_a @@ -1332,15 +1299,14 @@ line 4, column 10 of ${p.join('pkg_a', 'mono_pkg.yaml')}: Unsupported value for group('dependabot', () { test('Simple', () async { - await populateConfig( - r''' + await populateConfig(r''' github: dependabot: {} -''', - ); +'''); testGenerateConfig( - printMatcher: - contains('Wrote `${d.path('.github/dependabot.yml')}`.\n'), + printMatcher: contains( + 'Wrote `${d.path('.github/dependabot.yml')}`.\n', + ), ); await d.dir('.github', [ d.file('dependabot.yml', ''' @@ -1362,8 +1328,7 @@ github: }); test('global configuration', () async { - await populateConfig( - r''' + await populateConfig(r''' github: dependabot: version: 3 @@ -1372,11 +1337,11 @@ github: directory: "/" schedule: interval: "monthly" -''', - ); +'''); testGenerateConfig( - printMatcher: - contains('Wrote `${d.path('.github/dependabot.yml')}`.\n'), + printMatcher: contains( + 'Wrote `${d.path('.github/dependabot.yml')}`.\n', + ), ); await d.dir('.github', [ d.file('dependabot.yml', ''' @@ -1411,11 +1376,10 @@ package:sub_pkg ${_writeScriptOutput(withDependabot)}'''; String _writeScriptOutput(bool withDependabot) => [ - 'Wrote `${p.join(d.sandbox, defaultGitHubWorkflowFilePath)}`.', - if (withDependabot) - 'Wrote `${p.join(d.sandbox, '.github/dependabot.yml')}`.', - ciScriptPathMessage, - ].join('\n'); + 'Wrote `${p.join(d.sandbox, defaultGitHubWorkflowFilePath)}`.', + if (withDependabot) 'Wrote `${p.join(d.sandbox, '.github/dependabot.yml')}`.', + ciScriptPathMessage, +].join('\n'); Future _testBadConfig( Object monoRepoYaml, @@ -1423,8 +1387,5 @@ Future _testBadConfig( ) async { final monoConfigContent = toYaml(monoRepoYaml); await populateConfig(monoConfigContent); - expect( - testGenerateConfig, - throwsAParsedYamlException(expectedParsedYaml), - ); + expect(testGenerateConfig, throwsAParsedYamlException(expectedParsedYaml)); } diff --git a/mono_repo/test/github_command_test.dart b/mono_repo/test/github_command_test.dart index c04f93da..9f8bf6e8 100644 --- a/mono_repo/test/github_command_test.dart +++ b/mono_repo/test/github_command_test.dart @@ -83,7 +83,7 @@ line 2, column 8 of mono_repo.yaml: Unsupported value for "env". type 'String' i { 'steps': [], 'needs': ['foo'], - } + }, ], }, }, @@ -122,7 +122,7 @@ line 3, column 7 of mono_repo.yaml: Required keys are missing: steps. 'on_completion': [ { 'steps': [{}], - } + }, ], }, }, @@ -143,12 +143,9 @@ line 4, column 11 of mono_repo.yaml: Missing key "uses". Either `run` or `uses` 'on_completion': [ { 'steps': [ - { - 'run': 'bob', - 'uses': 'bob', - } + {'run': 'bob', 'uses': 'bob'}, ], - } + }, ], }, }, @@ -169,12 +166,9 @@ line 5, column 17 of mono_repo.yaml: Unsupported value for "uses". `uses` and `r 'on_completion': [ { 'steps': [ - { - 'run': 'bob', - 'with': {}, - } + {'run': 'bob', 'with': {}}, ], - } + }, ], }, }, @@ -339,10 +333,7 @@ line 7, column 7 of mono_repo.yaml: Unrecognized keys: [extra]; supported keys: { 'github': { 'workflows': { - 'bob': { - 'name': 'bob', - 'stages': [], - }, + 'bob': {'name': 'bob', 'stages': []}, }, }, }, @@ -424,32 +415,27 @@ line 4, column 13 of mono_repo.yaml: Unsupported value for "name". Cannot be the ), ); - test( - 'all defined stages must have corresponding jobs', - () async { - final monoConfigContent = toYaml( - { - 'github': { - 'workflows': { - 'bob': { - 'name': 'bob', - 'stages': ['oops'], - }, - }, + test('all defined stages must have corresponding jobs', () async { + final monoConfigContent = toYaml({ + 'github': { + 'workflows': { + 'bob': { + 'name': 'bob', + 'stages': ['oops'], }, }, - ); - await populateConfig(monoConfigContent); - - expect( - () => testGenerateConfig(printMatcher: 'package:sub_pkg'), - throwsUserExceptionWith( - 'No jobs are defined for the stage "oops" ' - 'defined in GitHub workflow "bob".', - ), - ); - }, - ); + }, + }); + await populateConfig(monoConfigContent); + + expect( + () => testGenerateConfig(printMatcher: 'package:sub_pkg'), + throwsUserExceptionWith( + 'No jobs are defined for the stage "oops" ' + 'defined in GitHub workflow "bob".', + ), + ); + }); test( 'two workflows cannot have the same stage', @@ -485,20 +471,22 @@ line 3, column 5 of mono_repo.yaml: Unsupported value for "workflows". Stage "st test( 'two workflows cannot have the same name', - () => _testBadConfigWithYamlException({ - 'github': { - 'workflows': { - 'alice': { - 'name': 'bob', - 'stages': ['oops'], - }, - 'bob': { - 'name': 'bob', - 'stages': ['oops'], + () => _testBadConfigWithYamlException( + { + 'github': { + 'workflows': { + 'alice': { + 'name': 'bob', + 'stages': ['oops'], + }, + 'bob': { + 'name': 'bob', + 'stages': ['oops'], + }, }, }, }, - }, r''' + r''' line 3, column 5 of mono_repo.yaml: Unsupported value for "workflows". Workflows must have different names. Duplicate name(s): bob ╷ 3 │ ┌ alice: @@ -509,7 +497,8 @@ line 3, column 5 of mono_repo.yaml: Unsupported value for "workflows". Workflows 8 │ │ name: bob 9 │ │ stages: 10 │ └ - oops - ╵'''), + ╵''', + ), ); } @@ -519,10 +508,7 @@ Future _testBadConfigWithYamlException( ) async { final monoConfigContent = toYaml(monoRepoYaml); await populateConfig(monoConfigContent); - expect( - testGenerateConfig, - throwsAParsedYamlException(expectedParsedYaml), - ); + expect(testGenerateConfig, throwsAParsedYamlException(expectedParsedYaml)); } Future _testBadConfigWithUserException( diff --git a/mono_repo/test/list_command_test.dart b/mono_repo/test/list_command_test.dart index 431916a5..f3b06b16 100644 --- a/mono_repo/test/list_command_test.dart +++ b/mono_repo/test/list_command_test.dart @@ -42,17 +42,9 @@ void main() { listPackages( RootConfig(rootDirectory: d.sandbox), onlyPublished: false, - showItems: { - Column.path, - Column.name, - }, + showItems: {Column.path, Column.name}, ), - [ - 'pkg1_dir,pkg1', - 'pkg2_dir,pkg2', - 'pkg3_dir,pkg3', - 'pkg4_dir,pkg4', - ], + ['pkg1_dir,pkg1', 'pkg2_dir,pkg2', 'pkg3_dir,pkg3', 'pkg4_dir,pkg4'], ); }); } diff --git a/mono_repo/test/mono_config_test.dart b/mono_repo/test/mono_config_test.dart index fab7f0cb..44575301 100644 --- a/mono_repo/test/mono_config_test.dart +++ b/mono_repo/test/mono_config_test.dart @@ -19,14 +19,10 @@ String _encodeJson(Object? input) => const JsonEncoder.withIndent(' ').convert(input); PackageConfig _parse(Object map) => PackageConfig.parse( - 'a', - _dummyPubspec, - map is YamlMap - ? map - : loadYamlChecked( - _encodeJson(map), - ) as Map, - ); + 'a', + _dummyPubspec, + map is YamlMap ? map : loadYamlChecked(_encodeJson(map)) as Map, +); void _expectParseThrows(Object content, String expectedError) => expect(() => _parse(content), throwsAParsedYamlException(expectedError)); @@ -34,18 +30,20 @@ void _expectParseThrows(Object content, String expectedError) => void main() { glyph.ascii = false; - test('no stages - end up with one `unit_test` stage with one `test` task', - () { - final config = _parse({ - 'sdk': ['stable'], - }); + test( + 'no stages - end up with one `unit_test` stage with one `test` task', + () { + final config = _parse({ + 'sdk': ['stable'], + }); - final oneJob = config.jobs.single; - expect(oneJob.sdk, 'stable'); - expect(oneJob.tasks.first.type.name, 'test'); - expect(oneJob.tasks.first.args, isNull); - expect(oneJob.stageName, 'unit_test'); - }); + final oneJob = config.jobs.single; + expect(oneJob.sdk, 'stable'); + expect(oneJob.tasks.first.type.name, 'test'); + expect(oneJob.tasks.first.args, isNull); + expect(oneJob.stageName, 'unit_test'); + }, + ); test('valid example', () { final monoYaml = loadYamlChecked(_testConfig1) as Map; @@ -54,8 +52,9 @@ void main() { expect(config.sdks, ['1.23.0', 'dev', 'stable']); - final jobs = - jsonDecode(jsonEncode(config.jobs.map((tj) => tj.toJson()).toList())); + final jobs = jsonDecode( + jsonEncode(config.jobs.map((tj) => tj.toJson()).toList()), + ); expect(jobs, _testConfig1expectedOutput); }); @@ -75,7 +74,7 @@ void main() { 'stages': [ { 'format': ['dartfmt'], - } + }, ], }, r''' @@ -98,7 +97,8 @@ stages: - [dartfmt] - dartanalyzer: --fatal-infos --fatal-warnings . sdk: dev -''') as Object, +''') + as Object, r''' line 4, column 7: Must be a map or a string. ╷ @@ -140,17 +140,14 @@ line 2, column 9: Unsupported value for "sdk". The value for "sdk" must be an ar ], }; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 7, column 9: Unsupported value for "a". Stages must be a list of maps with exactly one key (the name of the stage), but the provided value `{a: 42}` is not valid. ╷ 7 │ "a": 42 │ ┌─────────^ 8 │ │ } │ └──^ - ╵''', - ); + ╵'''); }); test('Stages tasks must be a list', () { @@ -161,63 +158,57 @@ line 7, column 9: Unsupported value for "a". Stages must be a list of maps with ], }; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 7, column 9: Unsupported value for "a". Stages must be a list of maps with exactly one key (the name of the stage), but the provided value `{a: 42}` is not valid. ╷ 7 │ "a": 42 │ ┌─────────^ 8 │ │ } │ └──^ - ╵''', - ); + ╵'''); }); test('Stages tasks must be a list', () { - final monoYaml = loadYaml(''' + final monoYaml = + loadYaml(''' stages: - smoke_test: - description: 'bob' group: funky sdk: dev -''') as Object; +''') + as Object; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 4, column 12: Unsupported value for "group". expected a list of tasks ╷ 4 │ group: funky │ ^^^^^ - ╵''', - ); + ╵'''); }); test( - 'Stages tasks must be a list with map with one key in the approved set', - () { - final monoYaml = { - 'sdk': ['stable'], - 'stages': [ - { - 'a': [ - {'weird': 'thing'}, - ], - }, - ], - }; + 'Stages tasks must be a list with map with one key in the approved set', + () { + final monoYaml = { + 'sdk': ['stable'], + 'stages': [ + { + 'a': [ + {'weird': 'thing'}, + ], + }, + ], + }; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 9, column 6: Must have one key of `format`, `analyze`, `test`, `command`, `test_with_coverage`. ╷ 9 │ "weird": "thing" │ ^^^^^^^ - ╵''', - ); - }); + ╵'''); + }, + ); test('Stage tasks entries must have one key in the approved set', () { final monoYaml = { @@ -231,15 +222,12 @@ line 9, column 6: Must have one key of `format`, `analyze`, `test`, `command`, ` ], }; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 10, column 6: Must have one and only one key of `format`, `analyze`, `test`, `command`, `test_with_coverage`. ╷ 10 │ "command": "other thing" │ ^^^^^^^^^ - ╵''', - ); + ╵'''); }); test('empty stage job', () { @@ -249,15 +237,12 @@ line 10, column 6: Must have one and only one key of `format`, `analyze`, `test` {'a': []}, ], }; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 7, column 9: Unsupported value for "a". Stages are required to have at least one job. "a" is empty. ╷ 7 │ "a": [] │ ^^ - ╵''', - ); + ╵'''); }); test('multiple keys under a stage', () { @@ -267,15 +252,12 @@ line 7, column 9: Unsupported value for "a". Stages are required to have at leas {'a': null, 'b': null}, ], }; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 8, column 4: Stages must be a list of maps with exactly one key (the name of the stage), but the provided value has 2 values. ╷ 8 │ "b": null │ ^^^ - ╵''', - ); + ╵'''); }); test('no keys under a stage', () { @@ -283,15 +265,12 @@ line 8, column 4: Stages must be a list of maps with exactly one key (the name o 'sdk': ['stable'], 'stages': [{}], }; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 6, column 3: Stages must be a list of maps with exactly one key (the name of the stage), but no items exist. ╷ 6 │ {} │ ^^ - ╵''', - ); + ╵'''); }); test('null stage job', () { @@ -301,17 +280,14 @@ line 6, column 3: Stages must be a list of maps with exactly one key (the name o {'a': null}, ], }; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 7, column 9: Unsupported value for "a". Stages are required to have at least one job. "a" is null. ╷ 7 │ "a": null │ ┌─────────^ 8 │ │ } │ └──^ - ╵''', - ); + ╵'''); }); test('unsupported keys', () { @@ -328,15 +304,12 @@ line 7, column 9: Unsupported value for "a". Stages are required to have at leas ], 'more': null, }; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 2, column 2: Unrecognized keys: [extra, more]; supported keys: [os, sdk, stages, cache] ╷ 2 │ "extra": "foo", │ ^^^^^^^ - ╵''', - ); + ╵'''); }); test('Duplicate stage names are not allowed', () { @@ -352,15 +325,12 @@ line 2, column 2: Unrecognized keys: [extra, more]; supported keys: [os, sdk, st ], }; - _expectParseThrows( - monoYaml, - r''' + _expectParseThrows(monoYaml, r''' line 12, column 4: Stages must be unique. "a" appears more than once. ╷ 12 │ "a": [ │ ^^^ - ╵''', - ); + ╵'''); }); test('SDKs must be versions or in the allow-list', () { @@ -418,194 +388,194 @@ stages: '''; List get _testConfig1expectedOutput => [ + { + 'description': 'dartanalyzer && dartfmt', + 'os': 'windows', + 'package': 'a', + 'sdk': 'dev', + 'stageName': 'analyze_and_format', + 'tasks': [ { - 'description': 'dartanalyzer && dartfmt', - 'os': 'windows', - 'package': 'a', - 'sdk': 'dev', - 'stageName': 'analyze_and_format', - 'tasks': [ - { - 'flavor': 'dart', - 'type': 'analyze', - 'args': '--fatal-infos --fatal-warnings .', - }, - {'flavor': 'dart', 'type': 'format'}, - ], 'flavor': 'dart', + 'type': 'analyze', + 'args': '--fatal-infos --fatal-warnings .', }, + {'flavor': 'dart', 'type': 'format'}, + ], + 'flavor': 'dart', + }, + { + 'description': 'dartanalyzer && dartfmt', + 'os': 'linux', + 'package': 'a', + 'sdk': 'dev', + 'stageName': 'analyze_and_format', + 'tasks': [ { - 'description': 'dartanalyzer && dartfmt', - 'os': 'linux', - 'package': 'a', - 'sdk': 'dev', - 'stageName': 'analyze_and_format', - 'tasks': [ - { - 'flavor': 'dart', - 'type': 'analyze', - 'args': '--fatal-infos --fatal-warnings .', - }, - {'flavor': 'dart', 'type': 'format'}, - ], 'flavor': 'dart', + 'type': 'analyze', + 'args': '--fatal-infos --fatal-warnings .', }, + {'flavor': 'dart', 'type': 'format'}, + ], + 'flavor': 'dart', + }, + { + 'os': 'osx', + 'package': 'a', + 'sdk': '1.23.0', + 'stageName': 'analyze_and_format', + 'tasks': [ { - 'os': 'osx', - 'package': 'a', - 'sdk': '1.23.0', - 'stageName': 'analyze_and_format', - 'tasks': [ - { - 'flavor': 'dart', - 'type': 'analyze', - 'args': '--fatal-infos --fatal-warnings .', - } - ], 'flavor': 'dart', + 'type': 'analyze', + 'args': '--fatal-infos --fatal-warnings .', }, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': '1.23.0', + 'stageName': 'unit_test', + 'tasks': [ + {'flavor': 'dart', 'type': 'test', 'args': '--platform chrome'}, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': 'dev', + 'stageName': 'unit_test', + 'tasks': [ + {'flavor': 'dart', 'type': 'test', 'args': '--platform chrome'}, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': 'stable', + 'stageName': 'unit_test', + 'tasks': [ + {'flavor': 'dart', 'type': 'test', 'args': '--platform chrome'}, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': '1.23.0', + 'stageName': 'unit_test', + 'tasks': [ { - 'os': 'linux', - 'package': 'a', - 'sdk': '1.23.0', - 'stageName': 'unit_test', - 'tasks': [ - {'flavor': 'dart', 'type': 'test', 'args': '--platform chrome'}, - ], 'flavor': 'dart', + 'type': 'test', + 'args': '--preset travis --total-shards 5 --shard-index 0', }, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': 'dev', + 'stageName': 'unit_test', + 'tasks': [ { - 'os': 'linux', - 'package': 'a', - 'sdk': 'dev', - 'stageName': 'unit_test', - 'tasks': [ - {'flavor': 'dart', 'type': 'test', 'args': '--platform chrome'}, - ], 'flavor': 'dart', + 'type': 'test', + 'args': '--preset travis --total-shards 5 --shard-index 0', }, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': 'stable', + 'stageName': 'unit_test', + 'tasks': [ { - 'os': 'linux', - 'package': 'a', - 'sdk': 'stable', - 'stageName': 'unit_test', - 'tasks': [ - {'flavor': 'dart', 'type': 'test', 'args': '--platform chrome'}, - ], 'flavor': 'dart', + 'type': 'test', + 'args': '--preset travis --total-shards 5 --shard-index 0', }, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': '1.23.0', + 'stageName': 'unit_test', + 'tasks': [ { - 'os': 'linux', - 'package': 'a', - 'sdk': '1.23.0', - 'stageName': 'unit_test', - 'tasks': [ - { - 'flavor': 'dart', - 'type': 'test', - 'args': '--preset travis --total-shards 5 --shard-index 0', - } - ], - 'flavor': 'dart', - }, - { - 'os': 'linux', - 'package': 'a', - 'sdk': 'dev', - 'stageName': 'unit_test', - 'tasks': [ - { - 'flavor': 'dart', - 'type': 'test', - 'args': '--preset travis --total-shards 5 --shard-index 0', - } - ], - 'flavor': 'dart', - }, - { - 'os': 'linux', - 'package': 'a', - 'sdk': 'stable', - 'stageName': 'unit_test', - 'tasks': [ - { - 'flavor': 'dart', - 'type': 'test', - 'args': '--preset travis --total-shards 5 --shard-index 0', - } - ], 'flavor': 'dart', + 'type': 'test', + 'args': '--preset travis --total-shards 5 --shard-index 1', }, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': 'dev', + 'stageName': 'unit_test', + 'tasks': [ { - 'os': 'linux', - 'package': 'a', - 'sdk': '1.23.0', - 'stageName': 'unit_test', - 'tasks': [ - { - 'flavor': 'dart', - 'type': 'test', - 'args': '--preset travis --total-shards 5 --shard-index 1', - } - ], 'flavor': 'dart', + 'type': 'test', + 'args': '--preset travis --total-shards 5 --shard-index 1', }, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': 'stable', + 'stageName': 'unit_test', + 'tasks': [ { - 'os': 'linux', - 'package': 'a', - 'sdk': 'dev', - 'stageName': 'unit_test', - 'tasks': [ - { - 'flavor': 'dart', - 'type': 'test', - 'args': '--preset travis --total-shards 5 --shard-index 1', - } - ], 'flavor': 'dart', + 'type': 'test', + 'args': '--preset travis --total-shards 5 --shard-index 1', }, - { - 'os': 'linux', - 'package': 'a', - 'sdk': 'stable', - 'stageName': 'unit_test', - 'tasks': [ - { - 'flavor': 'dart', - 'type': 'test', - 'args': '--preset travis --total-shards 5 --shard-index 1', - } - ], - 'flavor': 'dart', - }, - { - 'os': 'linux', - 'package': 'a', - 'sdk': '1.23.0', - 'stageName': 'unit_test', - 'tasks': [ - {'flavor': 'dart', 'type': 'test'}, - ], - 'flavor': 'dart', - }, - { - 'os': 'linux', - 'package': 'a', - 'sdk': 'dev', - 'stageName': 'unit_test', - 'tasks': [ - {'flavor': 'dart', 'type': 'test'}, - ], - 'flavor': 'dart', - }, - { - 'os': 'linux', - 'package': 'a', - 'sdk': 'stable', - 'stageName': 'unit_test', - 'tasks': [ - {'flavor': 'dart', 'type': 'test'}, - ], - 'flavor': 'dart', - } - ]; + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': '1.23.0', + 'stageName': 'unit_test', + 'tasks': [ + {'flavor': 'dart', 'type': 'test'}, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': 'dev', + 'stageName': 'unit_test', + 'tasks': [ + {'flavor': 'dart', 'type': 'test'}, + ], + 'flavor': 'dart', + }, + { + 'os': 'linux', + 'package': 'a', + 'sdk': 'stable', + 'stageName': 'unit_test', + 'tasks': [ + {'flavor': 'dart', 'type': 'test'}, + ], + 'flavor': 'dart', + }, +]; diff --git a/mono_repo/test/presubmit_command_test.dart b/mono_repo/test/presubmit_command_test.dart index 5e98874e..6d559092 100644 --- a/mono_repo/test/presubmit_command_test.dart +++ b/mono_repo/test/presubmit_command_test.dart @@ -82,51 +82,52 @@ environment: generateCIScript(config); }, prints( - stringContainsInOrder( - [ - 'package:pkg_a', - 'package:pkg_b', - 'Make sure to mark `tool/ci.sh` as executable.', - ], - ), + stringContainsInOrder([ + 'package:pkg_a', + 'package:pkg_b', + 'Make sure to mark `tool/ci.sh` as executable.', + ]), ), ); }); - await Process.run( - 'chmod', - ['+x', p.join('tool', 'ci.sh')], - workingDirectory: repoPath, - ); - await Process.run( - Executable.dart.path, - ['pub', 'get'], - workingDirectory: pkgAPath, - ); - await Process.run( - Executable.dart.path, - ['pub', 'global', 'activate', '-s', 'path', Directory.current.path], - ); + await Process.run('chmod', [ + '+x', + p.join('tool', 'ci.sh'), + ], workingDirectory: repoPath); + await Process.run(Executable.dart.path, [ + 'pub', + 'get', + ], workingDirectory: pkgAPath); + await Process.run(Executable.dart.path, [ + 'pub', + 'global', + 'activate', + '-s', + 'path', + Directory.current.path, + ]); }); tearDownAll(() { Directory(repoPath).deleteSync(recursive: true); }); - test( - 'runs all tasks and packages', - () async { - final result = await Process.run( - Executable.dart.path, - ['pub', 'global', 'run', 'mono_repo', 'presubmit', '--sdk=dev'], - workingDirectory: repoPath, - ); - expect( - result.exitCode, - 0, - reason: 'stderr:\n${result.stderr}\nstdout:\n${result.stdout}', - ); - expect(result.stdout, ''' + test('runs all tasks and packages', () async { + final result = await Process.run(Executable.dart.path, [ + 'pub', + 'global', + 'run', + 'mono_repo', + 'presubmit', + '--sdk=dev', + ], workingDirectory: repoPath); + expect( + result.exitCode, + 0, + reason: 'stderr:\n${result.stderr}\nstdout:\n${result.stdout}', + ); + expect(result.stdout, ''' pkg_a SDK: dev TASK: dart analyze success @@ -146,25 +147,19 @@ pkg_b SDK: stable TASK: dart format --output=none --set-exit-if-changed . skipped, mismatched sdk '''); - }, - timeout: const Timeout.factor(2), - ); + }, timeout: const Timeout.factor(2)); test('can filter by package', () async { - final result = await Process.run( - Executable.dart.path, - [ - 'pub', - 'global', - 'run', - 'mono_repo', - 'presubmit', - '--sdk=dev', - '-p', - 'pkg_b', - ], - workingDirectory: repoPath, - ); + final result = await Process.run(Executable.dart.path, [ + 'pub', + 'global', + 'run', + 'mono_repo', + 'presubmit', + '--sdk=dev', + '-p', + 'pkg_b', + ], workingDirectory: repoPath); expect( result.exitCode, 0, @@ -180,20 +175,16 @@ pkg_b }); test('can filter by task', () async { - final result = await Process.run( - Executable.dart.path, - [ - 'pub', - 'global', - 'run', - 'mono_repo', - 'presubmit', - '--sdk=dev', - '-t', - 'format', - ], - workingDirectory: repoPath, - ); + final result = await Process.run(Executable.dart.path, [ + 'pub', + 'global', + 'run', + 'mono_repo', + 'presubmit', + '--sdk=dev', + '-t', + 'format', + ], workingDirectory: repoPath); expect( result.exitCode, 0, diff --git a/mono_repo/test/readme_command_test.dart b/mono_repo/test/readme_command_test.dart index ef1802d2..d4146a97 100644 --- a/mono_repo/test/readme_command_test.dart +++ b/mono_repo/test/readme_command_test.dart @@ -9,18 +9,19 @@ void main() { setUp(listReadmeSetup); test('show everything', () async { expect( - readme( - RootConfig(rootDirectory: d.sandbox), - onlyPublished: false, - pad: false, - ), - ''' + readme( + RootConfig(rootDirectory: d.sandbox), + onlyPublished: false, + pad: false, + ), + ''' | Package | Description | Version | |---|---|---| | [pkg1](pkg1_dir/) | | | | [pkg2](pkg2_dir/) | | | | [pkg3](pkg3_dir/) | | [![pub package](https://img.shields.io/pub/v/pkg3.svg)](https://pub.dev/packages/pkg3) | -| [pkg4](pkg4_dir/) | | [![pub package](https://img.shields.io/pub/v/pkg4.svg)](https://pub.dev/packages/pkg4) |'''); +| [pkg4](pkg4_dir/) | | [![pub package](https://img.shields.io/pub/v/pkg4.svg)](https://pub.dev/packages/pkg4) |''', + ); }); test('only published', () async { diff --git a/mono_repo/test/readme_test.dart b/mono_repo/test/readme_test.dart index 9a05a9fd..7607e60a 100644 --- a/mono_repo/test/readme_test.dart +++ b/mono_repo/test/readme_test.dart @@ -39,25 +39,17 @@ environment: ]).create(); testGenerateConfig( - printMatcher: stringContainsInOrder( - [ - 'package:sub_pkg\n', - 'Make sure to mark `tool/ci.sh` as executable.\n', - ' chmod +x tool/ci.sh\n', - ], - ), + printMatcher: stringContainsInOrder([ + 'package:sub_pkg\n', + 'Make sure to mark `tool/ci.sh` as executable.\n', + ' chmod +x tool/ci.sh\n', + ]), ); - void validateFile( - String fileToVerify, - String expectedOutputFileName, - ) { + void validateFile(String fileToVerify, String expectedOutputFileName) { final inputFile = File(p.join(d.sandbox, fileToVerify)); final sourceContent = inputFile.readAsStringSync(); - validateOutput( - 'readme_$expectedOutputFileName.txt', - sourceContent, - ); + validateOutput('readme_$expectedOutputFileName.txt', sourceContent); } validateFile(ciScriptPath, 'ci'); diff --git a/mono_repo/test/root_config_test.dart b/mono_repo/test/root_config_test.dart index f5822943..1f5f1536 100644 --- a/mono_repo/test/root_config_test.dart +++ b/mono_repo/test/root_config_test.dart @@ -9,8 +9,9 @@ void main() { group('RootConfig', () { test('parseActionVersions', () { final file = File(path.join('..', defaultGitHubWorkflowFilePath)); - final parsedVersions = - RootConfig.parseActionVersions(file.readAsStringSync()); + final parsedVersions = RootConfig.parseActionVersions( + file.readAsStringSync(), + ); expect(parsedVersions, isNotEmpty); diff --git a/mono_repo/test/shared.dart b/mono_repo/test/shared.dart index 05e64bab..03755b68 100644 --- a/mono_repo/test/shared.dart +++ b/mono_repo/test/shared.dart @@ -26,20 +26,14 @@ name: pkg_name ]).create(); } -void testGenerateConfig({ - bool validateOnly = false, - Object? printMatcher, -}) { +void testGenerateConfig({bool validateOnly = false, Object? printMatcher}) { printMatcher ??= isEmpty; final printOutput = []; try { testGenerate( () { final config = RootConfig(rootDirectory: d.sandbox); - generate( - config, - validateOnly, - ); + generate(config, validateOnly); }, zoneSpec: ZoneSpecification( print: (z1, zd, z2, value) { @@ -55,21 +49,21 @@ void testGenerateConfig({ } Matcher throwsUserExceptionWith(Object message, {Object? details}) => throwsA( - const TypeMatcher() - .having((e) => e.message, 'message', message) - .having((e) => e.details, 'details', details ?? isNull), - ); + const TypeMatcher() + .having((e) => e.message, 'message', message) + .having((e) => e.details, 'details', details ?? isNull), +); Matcher throwsAParsedYamlException(Object matcher) => throwsA( - isA().having( - (e) { - printOnFailure("r'''\n${e.formattedMessage}'''"); - return e.formattedMessage; - }, - 'formattedMessage', - matcher, - ), - ); + isA().having( + (e) { + printOnFailure("r'''\n${e.formattedMessage}'''"); + return e.formattedMessage; + }, + 'formattedMessage', + matcher, + ), +); const testConfig2 = r''' sdk: @@ -101,7 +95,8 @@ stages: - test: --preset travis '''; -String get ciScriptPathMessage => ''' +String get ciScriptPathMessage => + ''' ${scriptLines(ciScriptPath).join('\n')} Wrote `${p.join(d.sandbox, ciScriptPath)}`.'''; @@ -114,28 +109,19 @@ void validateOutput(String fileName, String output) { expect(output, isNotEmpty); final expectedOutputFile = File( - p.join( - 'test', - 'script_integration_outputs', - fileName, - ), + p.join('test', 'script_integration_outputs', fileName), ); if (expectedOutputFile.existsSync()) { - final expected = - expectedOutputFile.readAsStringSync().replaceAll('\r\n', '\n'); - expect( - output, - expected, + final expected = expectedOutputFile.readAsStringSync().replaceAll( + '\r\n', + '\n', ); + expect(output, expected); } else { expectedOutputFile ..createSync(recursive: true) - ..writeAsStringSync( - output, - mode: FileMode.writeOnly, - flush: true, - ); + ..writeAsStringSync(output, mode: FileMode.writeOnly, flush: true); // Using addTearDown here so all files in a test are processed before any // error is raised. This allows the expected output files to be processed diff --git a/mono_repo/test/src/expected_output.dart b/mono_repo/test/src/expected_output.dart index 5362f336..145edbc7 100644 --- a/mono_repo/test/src/expected_output.dart +++ b/mono_repo/test/src/expected_output.dart @@ -1,6 +1,7 @@ import 'package:mono_repo/src/ci_test_script.dart'; -final ciShellOutput = ''' +final ciShellOutput = + ''' $bashScriptHeader ''' @@ -91,7 +92,8 @@ if [ ${#FAILURES[@]} -ne 0 ]; then fi """; -final ciShellOutputMultiFlavor = ''' +final ciShellOutputMultiFlavor = + ''' $bashScriptHeader ''' diff --git a/mono_repo/test/yaml_write_test.dart b/mono_repo/test/yaml_write_test.dart index 10468208..282066dd 100644 --- a/mono_repo/test/yaml_write_test.dart +++ b/mono_repo/test/yaml_write_test.dart @@ -148,9 +148,7 @@ void _testRoundTrip(Object? source, {String? expectedEncoding}) { if (source is String) { // multi-line map value - _testRoundTripCore({ - 'double the value': '$source\n$source', - }); + _testRoundTripCore({'double the value': '$source\n$source'}); _testRoundTripCore({ 'double the value, indent second': '$source\n $source', }); @@ -257,7 +255,7 @@ final _testItems = [ [ {'test': 1}, {'test': 2}, - ] + ], ]; /// From json_serializable tests diff --git a/mono_repo/tool/generate_action_versions.dart b/mono_repo/tool/generate_action_versions.dart index 2a0763fe..95d1b14b 100644 --- a/mono_repo/tool/generate_action_versions.dart +++ b/mono_repo/tool/generate_action_versions.dart @@ -13,14 +13,17 @@ void main(List args) { final validateOnly = parsedArgs['validate'] as bool; final versionsFile = File('lib/src/commands/github/action_versions.dart'); if (!versionsFile.existsSync()) { - print('Unable to find existing versions file at `${versionsFile.path}`, ' - 'make sure you are running from the `mono_repo` package directory'); + print( + 'Unable to find existing versions file at `${versionsFile.path}`, ' + 'make sure you are running from the `mono_repo` package directory', + ); exit(1); } final previousContent = versionsFile.readAsStringSync(); final workflowFile = File('../.github/workflows/dart.yml'); - final versions = - RootConfig.parseActionVersions(workflowFile.readAsStringSync()); + final versions = RootConfig.parseActionVersions( + workflowFile.readAsStringSync(), + ); final newContentBuffer = StringBuffer(''' // Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file // for details. All rights reserved. Use of this source code is governed by a @@ -32,15 +35,18 @@ void main(List args) { '''); for (var entry in versions.entries) { - newContentBuffer - .writeln("const ${entry.key.toVariableName} = '${entry.value}';"); + newContentBuffer.writeln( + "const ${entry.key.toVariableName} = '${entry.value}';", + ); } final tmpDir = Directory.systemTemp.createTempSync('gen_action_versions'); - final tmpFile = - File.fromUri(tmpDir.uri.resolve('generate_action_versions.dart')) - ..writeAsStringSync(newContentBuffer.toString()); - final fmtResult = - Process.runSync(Platform.resolvedExecutable, ['format', tmpFile.path]); + final tmpFile = File.fromUri( + tmpDir.uri.resolve('generate_action_versions.dart'), + )..writeAsStringSync(newContentBuffer.toString()); + final fmtResult = Process.runSync(Platform.resolvedExecutable, [ + 'format', + tmpFile.path, + ]); if (fmtResult.exitCode != 0) { stdout ..writeln('Error: Failed to run dartfmt') From c2297d867a8d74fef2e065caba74f57e2e5d303e Mon Sep 17 00:00:00 2001 From: Kevin Moore Date: Mon, 13 Oct 2025 16:08:41 -0700 Subject: [PATCH 3/3] oops --- .../github_output_group_overrides.txt | 14 +++--- .../github_output_test_with_coverage.txt | 8 ++-- .../max_cache_key.txt | 46 +++++++++---------- .../readme_github_defaults.txt | 20 ++++---- .../readme_github_lints.txt | 20 ++++---- .../self_validate_set_to_a_stage_name.txt | 46 +++++++++---------- .../self_validate_set_to_true.txt | 46 +++++++++---------- .../should_merge_correctly.txt | 26 +++++------ .../two_dartfmt_flavors.txt | 12 ++--- .../two_dartfmt_flavors_different_args.txt | 12 ++--- .../valid_pubspec_version.txt | 32 ++++++------- 11 files changed, 141 insertions(+), 141 deletions(-) diff --git a/mono_repo/test/script_integration_outputs/github_output_group_overrides.txt b/mono_repo/test/script_integration_outputs/github_output_group_overrides.txt index 985149c3..a60ed50d 100644 --- a/mono_repo/test/script_integration_outputs/github_output_group_overrides.txt +++ b/mono_repo/test/script_integration_outputs/github_output_group_overrides.txt @@ -19,7 +19,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:pkg_a;commands:analyze-format" @@ -34,7 +34,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -58,7 +58,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:pkg_a;commands:test_1" @@ -88,7 +88,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -106,7 +106,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:pkg_a;commands:test_0" @@ -121,7 +121,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade diff --git a/mono_repo/test/script_integration_outputs/github_output_test_with_coverage.txt b/mono_repo/test/script_integration_outputs/github_output_test_with_coverage.txt index f4b09f2d..b455d019 100644 --- a/mono_repo/test/script_integration_outputs/github_output_test_with_coverage.txt +++ b/mono_repo/test/script_integration_outputs/github_output_test_with_coverage.txt @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:pkg_a;commands:test_with_coverage" @@ -36,7 +36,7 @@ jobs: run: "dart pub global activate coverage '>=1.5.0'" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -58,7 +58,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:pkg_a;commands:test" @@ -73,7 +73,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade diff --git a/mono_repo/test/script_integration_outputs/max_cache_key.txt b/mono_repo/test/script_integration_outputs/max_cache_key.txt index 402e74d3..9e1023d6 100644 --- a/mono_repo/test/script_integration_outputs/max_cache_key.txt +++ b/mono_repo/test/script_integration_outputs/max_cache_key.txt @@ -19,7 +19,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:analyze-format" @@ -34,7 +34,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -58,7 +58,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -73,7 +73,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:1.23.0;packages:sub_pkg;commands:test_1" @@ -88,7 +88,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -106,7 +106,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:1.23.0;packages:sub_pkg;commands:test_0" @@ -121,7 +121,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -139,7 +139,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:test_1" @@ -154,7 +154,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -172,7 +172,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:test_0" @@ -187,7 +187,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -205,7 +205,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:sub_pkg;commands:test_1" @@ -220,7 +220,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -238,7 +238,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:sub_pkg;commands:test_0" @@ -253,7 +253,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -276,7 +276,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -299,7 +299,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -322,7 +322,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -345,7 +345,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -368,7 +368,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -391,7 +391,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -409,7 +409,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:package_with_a_long_name_00-package_with_a_long_name_01-package_with_a_long_name_02-package_with_a_long_name_03-package_with_a_long_name_04-package_with_a_long_name_05-package_with_a_long_name_06-package_with_a_long_name_07-package_with_a_long_name_08-package_with_a_long_name_09-package_with_a_long_name_10-package_with_a_long_name_11-package_with_a_long_name_12-package_with_a_long_name_13-package_with_a_long_name_14-package_with_a-!!too_long!!-570-127648710" @@ -424,7 +424,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: package_with_a_long_name_00_pub_upgrade name: package_with_a_long_name_00; dart pub upgrade run: dart pub upgrade diff --git a/mono_repo/test/script_integration_outputs/readme_github_defaults.txt b/mono_repo/test/script_integration_outputs/readme_github_defaults.txt index 95d77caa..8ffcd4db 100644 --- a/mono_repo/test/script_integration_outputs/readme_github_defaults.txt +++ b/mono_repo/test/script_integration_outputs/readme_github_defaults.txt @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:sub_pkg;commands:test" @@ -37,7 +37,7 @@ jobs: sdk: "2.17.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -52,7 +52,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:test" @@ -67,7 +67,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -83,7 +83,7 @@ jobs: if: "github.event_name == 'schedule'" steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:sub_pkg;commands:test" @@ -98,7 +98,7 @@ jobs: sdk: "2.17.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -117,7 +117,7 @@ jobs: if: "github.event_name == 'schedule'" steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:test" @@ -132,7 +132,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -156,7 +156,7 @@ jobs: sdk: "2.17.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -180,7 +180,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade diff --git a/mono_repo/test/script_integration_outputs/readme_github_lints.txt b/mono_repo/test/script_integration_outputs/readme_github_lints.txt index 8defb4f0..9d8cd55b 100644 --- a/mono_repo/test/script_integration_outputs/readme_github_lints.txt +++ b/mono_repo/test/script_integration_outputs/readme_github_lints.txt @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -35,7 +35,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - name: mono_repo self validate run: dart pub global activate mono_repo 1.2.3 - name: mono_repo self validate @@ -45,7 +45,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:sub_pkg;commands:analyze" @@ -60,7 +60,7 @@ jobs: sdk: "2.17.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -75,7 +75,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.17.0;packages:sub_pkg;commands:format" @@ -90,7 +90,7 @@ jobs: sdk: "2.17.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -105,7 +105,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:analyze" @@ -120,7 +120,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -135,7 +135,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:format" @@ -150,7 +150,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade diff --git a/mono_repo/test/script_integration_outputs/self_validate_set_to_a_stage_name.txt b/mono_repo/test/script_integration_outputs/self_validate_set_to_a_stage_name.txt index e3b126cd..dba4581e 100644 --- a/mono_repo/test/script_integration_outputs/self_validate_set_to_a_stage_name.txt +++ b/mono_repo/test/script_integration_outputs/self_validate_set_to_a_stage_name.txt @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -32,7 +32,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - name: mono_repo self validate run: dart pub global activate mono_repo 1.2.3 - name: mono_repo self validate @@ -42,7 +42,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:analyze-format" @@ -57,7 +57,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -81,7 +81,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -96,7 +96,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:1.23.0;packages:sub_pkg;commands:test_1" @@ -111,7 +111,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -130,7 +130,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:1.23.0;packages:sub_pkg;commands:test_0" @@ -145,7 +145,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -164,7 +164,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:test_1" @@ -179,7 +179,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -198,7 +198,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:test_0" @@ -213,7 +213,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -232,7 +232,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:sub_pkg;commands:test_1" @@ -247,7 +247,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -266,7 +266,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:sub_pkg;commands:test_0" @@ -281,7 +281,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -305,7 +305,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -329,7 +329,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -353,7 +353,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -377,7 +377,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -401,7 +401,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -425,7 +425,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade diff --git a/mono_repo/test/script_integration_outputs/self_validate_set_to_true.txt b/mono_repo/test/script_integration_outputs/self_validate_set_to_true.txt index 7f5a7df1..d520689d 100644 --- a/mono_repo/test/script_integration_outputs/self_validate_set_to_true.txt +++ b/mono_repo/test/script_integration_outputs/self_validate_set_to_true.txt @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -32,7 +32,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - name: mono_repo self validate run: dart pub global activate mono_repo 1.2.3 - name: mono_repo self validate @@ -42,7 +42,7 @@ jobs: runs-on: macos-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:macos-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:analyze-format" @@ -57,7 +57,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -83,7 +83,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -100,7 +100,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:1.23.0;packages:sub_pkg;commands:test_1" @@ -115,7 +115,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -134,7 +134,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:1.23.0;packages:sub_pkg;commands:test_0" @@ -149,7 +149,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -168,7 +168,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:test_1" @@ -183,7 +183,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -202,7 +202,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:sub_pkg;commands:test_0" @@ -217,7 +217,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -236,7 +236,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:sub_pkg;commands:test_1" @@ -251,7 +251,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -270,7 +270,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:sub_pkg;commands:test_0" @@ -285,7 +285,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -309,7 +309,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -333,7 +333,7 @@ jobs: sdk: "1.23.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -357,7 +357,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -381,7 +381,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -405,7 +405,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade @@ -429,7 +429,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: sub_pkg_pub_upgrade name: sub_pkg; dart pub upgrade run: dart pub upgrade diff --git a/mono_repo/test/script_integration_outputs/should_merge_correctly.txt b/mono_repo/test/script_integration_outputs/should_merge_correctly.txt index 46beb696..89a185c5 100644 --- a/mono_repo/test/script_integration_outputs/should_merge_correctly.txt +++ b/mono_repo/test/script_integration_outputs/should_merge_correctly.txt @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:pkg_a-pkg_b;commands:analyze_0-format" @@ -34,7 +34,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -66,7 +66,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:pkg_c;commands:analyze_1-format" @@ -76,12 +76,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Flutter SDK - uses: subosito/flutter-action@f2c4f6686ca8e8d6e6d0f28410eeef506ed66aff + uses: subosito/flutter-action@fd55f4c5af5b953cc57a2be44cb082c8f6635e8e with: channel: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_c_pub_upgrade name: pkg_c; flutter pub upgrade run: flutter pub upgrade @@ -100,7 +100,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:pkg_a;commands:test_1" @@ -115,7 +115,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -133,7 +133,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:pkg_b;commands:test_1" @@ -148,7 +148,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_b_pub_upgrade name: pkg_b; dart pub upgrade run: dart pub upgrade @@ -166,7 +166,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:pkg_a;commands:test_0" @@ -181,7 +181,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -199,7 +199,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:pkg_b;commands:test_0" @@ -214,7 +214,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_b_pub_upgrade name: pkg_b; dart pub upgrade run: dart pub upgrade diff --git a/mono_repo/test/script_integration_outputs/two_dartfmt_flavors.txt b/mono_repo/test/script_integration_outputs/two_dartfmt_flavors.txt index 2f8f3e7e..995277cc 100644 --- a/mono_repo/test/script_integration_outputs/two_dartfmt_flavors.txt +++ b/mono_repo/test/script_integration_outputs/two_dartfmt_flavors.txt @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkg_a;commands:format" @@ -34,7 +34,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkg_b;commands:format" @@ -64,7 +64,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_b_pub_upgrade name: pkg_b; dart pub upgrade run: dart pub upgrade @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:pkg_a;commands:format" @@ -94,7 +94,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade diff --git a/mono_repo/test/script_integration_outputs/two_dartfmt_flavors_different_args.txt b/mono_repo/test/script_integration_outputs/two_dartfmt_flavors_different_args.txt index 12a4f967..8265d240 100644 --- a/mono_repo/test/script_integration_outputs/two_dartfmt_flavors_different_args.txt +++ b/mono_repo/test/script_integration_outputs/two_dartfmt_flavors_different_args.txt @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkg_a;commands:format_0" @@ -34,7 +34,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkg_b;commands:format_1" @@ -64,7 +64,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_b_pub_upgrade name: pkg_b; dart pub upgrade run: dart pub upgrade @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable;packages:pkg_a;commands:format_0" @@ -94,7 +94,7 @@ jobs: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade diff --git a/mono_repo/test/script_integration_outputs/valid_pubspec_version.txt b/mono_repo/test/script_integration_outputs/valid_pubspec_version.txt index 76eb8091..8381fdad 100644 --- a/mono_repo/test/script_integration_outputs/valid_pubspec_version.txt +++ b/mono_repo/test/script_integration_outputs/valid_pubspec_version.txt @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.16.0;packages:pkg_a;commands:analyze_1" @@ -34,7 +34,7 @@ jobs: sdk: "2.16.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkg_a;commands:analyze_0" @@ -64,7 +64,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -79,7 +79,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkg_a;commands:format" @@ -94,7 +94,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -109,7 +109,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.16.0;packages:pkg_a;commands:test_1" @@ -124,7 +124,7 @@ jobs: sdk: "2.16.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -143,7 +143,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:2.16.0;packages:pkg_a;commands:test_0" @@ -158,7 +158,7 @@ jobs: sdk: "2.16.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -177,7 +177,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkg_a;commands:test_1" @@ -192,7 +192,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -211,7 +211,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf + uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkg_a;commands:test_0" @@ -226,7 +226,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -250,7 +250,7 @@ jobs: sdk: "2.16.0" - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade @@ -274,7 +274,7 @@ jobs: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 - id: pkg_a_pub_upgrade name: pkg_a; dart pub upgrade run: dart pub upgrade