From 8829ef210682b0a535ac1830845a9a6022bafb9a Mon Sep 17 00:00:00 2001 From: Moritz Date: Wed, 28 Aug 2024 16:50:58 +0200 Subject: [PATCH 1/3] Continue with labeling after error with issue transfer --- pkgs/repo_manage/lib/issue_transfer.dart | 45 ++++++++++++++++-------- pkgs/repo_manage/pubspec.yaml | 2 +- 2 files changed, 32 insertions(+), 15 deletions(-) diff --git a/pkgs/repo_manage/lib/issue_transfer.dart b/pkgs/repo_manage/lib/issue_transfer.dart index 3bed0237..f5b5bf2b 100644 --- a/pkgs/repo_manage/lib/issue_transfer.dart +++ b/pkgs/repo_manage/lib/issue_transfer.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +import 'dart:io'; + import 'package:collection/collection.dart'; import 'package:github/github.dart'; import 'package:graphql/client.dart'; @@ -94,16 +96,21 @@ class TransferIssuesCommand extends ReportCommand { ); print('Transferred ${issues.length} issues'); + if (labelName != null) { - print('Adding label $labelName to all transferred issues'); - for (var issueNumber in issues) { - print('Add to issue $issueNumber'); - if (applyChanges) { - await reportRunner.github.issues.addLabelsToIssue( - targetRepo, - issueNumber, - [labelName], - ); + var label = + getInput('Label the transferred issues with $labelName? (y/N)'); + if (label) { + print('Adding label $labelName to all transferred issues'); + for (var issueNumber in issues) { + print('Add to issue $issueNumber'); + if (applyChanges) { + await reportRunner.github.issues.addLabelsToIssue( + targetRepo, + issueNumber, + [labelName], + ); + } } } } @@ -194,7 +201,12 @@ class TransferIssuesCommand extends ReportCommand { repositoryId, applyChanges, ); - allIssueIds.addAll(transferredIssues); + if (transferredIssues.$2 != null) { + stderr.writeln('Failed to transfer issues.'); + stderr.writeln(transferredIssues.$2); + return allIssueIds; + } + allIssueIds.addAll(transferredIssues.$1); await Future.delayed(const Duration(seconds: 1)); } @@ -209,7 +221,7 @@ class TransferIssuesCommand extends ReportCommand { } } - Future> _transferMutation( + Future<(List, Exception?)> _transferMutation( List issueIds, String repositoryId, bool applyChanges, @@ -239,10 +251,15 @@ class TransferIssuesCommand extends ReportCommand { .toList(); }, )); - if (result.hasException) throw result.exception!; - return result.parsedData ?? []; + return (result.parsedData ?? [], result.exception); } else { - return []; + return ([], null); } } + + bool getInput(String question) { + print(question); + final line = stdin.readLineSync()?.toLowerCase(); + return line == 'y' || line == 'yes'; + } } diff --git a/pkgs/repo_manage/pubspec.yaml b/pkgs/repo_manage/pubspec.yaml index 8292b173..c1945d02 100644 --- a/pkgs/repo_manage/pubspec.yaml +++ b/pkgs/repo_manage/pubspec.yaml @@ -4,7 +4,7 @@ description: Miscellaneous issue, repo, and PR query tools. publish_to: none environment: - sdk: ^3.1.0 + sdk: ^3.3.0 dependencies: args: ^2.4.0 From 4e70a4fdf9f712bfbad5f9ec088238879edd24cc Mon Sep 17 00:00:00 2001 From: Moritz Date: Fri, 30 Aug 2024 08:17:05 +0200 Subject: [PATCH 2/3] Run `dart pub global run mono_repo generate` --- .github/workflows/dart.yml | 167 ++++++++++++++++++++++--------------- tool/ci.sh | 18 ++-- 2 files changed, 111 insertions(+), 74 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 9e1e4bd0..9c015727 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.6.2 +# Created with package:mono_repo v6.5.1 name: Dart CI on: push: @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:stable" @@ -28,37 +28,37 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: stable - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: mono_repo self validate - run: dart pub global activate mono_repo 6.6.2 + run: dart pub global activate mono_repo 6.5.1 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; Dart 3.1.0; PKGS: pkgs/corpus, pkgs/firehose, pkgs/repo_manage; `dart analyze --fatal-infos .`" + name: "analyze_and_format; Dart 3.1.0; PKGS: pkgs/corpus, pkgs/firehose; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:pkgs/corpus-pkgs/firehose-pkgs/repo_manage;commands:analyze" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:pkgs/corpus-pkgs/firehose;commands:analyze" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:pkgs/corpus-pkgs/firehose-pkgs/repo_manage + os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:pkgs/corpus-pkgs/firehose os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: "3.1.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_corpus_pub_upgrade name: pkgs/corpus; dart pub upgrade run: dart pub upgrade @@ -77,6 +77,29 @@ jobs: run: dart analyze --fatal-infos . if: "always() && steps.pkgs_firehose_pub_upgrade.conclusion == 'success'" working-directory: pkgs/firehose + needs: + - job_001 + job_003: + name: "analyze_and_format; Dart 3.3.0; PKG: pkgs/repo_manage; `dart analyze --fatal-infos .`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/repo_manage;commands:analyze" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0;packages:pkgs/repo_manage + os:ubuntu-latest;pub-cache-hosted;sdk:3.3.0 + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 + with: + sdk: "3.3.0" + - id: checkout + name: Checkout repository + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_repo_manage_pub_upgrade name: pkgs/repo_manage; dart pub upgrade run: dart pub upgrade @@ -88,12 +111,12 @@ jobs: working-directory: pkgs/repo_manage needs: - job_001 - job_003: + job_004: name: "analyze_and_format; Dart 3.4.0; PKG: pkgs/sdk_triage_bot; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/sdk_triage_bot;commands:analyze" @@ -103,12 +126,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_sdk_triage_bot_pub_upgrade name: pkgs/sdk_triage_bot; dart pub upgrade run: dart pub upgrade @@ -120,12 +143,12 @@ jobs: working-directory: pkgs/sdk_triage_bot needs: - job_001 - job_004: + job_005: name: "analyze_and_format; Dart 3.5.0; PKG: pkgs/dart_flutter_team_lints; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/dart_flutter_team_lints;commands:analyze" @@ -135,12 +158,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_dart_flutter_team_lints_pub_upgrade name: pkgs/dart_flutter_team_lints; dart pub upgrade run: dart pub upgrade @@ -152,12 +175,12 @@ jobs: working-directory: pkgs/dart_flutter_team_lints needs: - job_001 - job_005: + job_006: name: "analyze_and_format; Dart dev; PKGS: pkgs/corpus, pkgs/dart_flutter_team_lints, pkgs/firehose, pkgs/repo_manage, pkgs/sdk_triage_bot; `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/corpus-pkgs/dart_flutter_team_lints-pkgs/firehose-pkgs/repo_manage-pkgs/sdk_triage_bot;commands:analyze" @@ -167,12 +190,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_corpus_pub_upgrade name: pkgs/corpus; dart pub upgrade run: dart pub upgrade @@ -220,12 +243,12 @@ jobs: working-directory: pkgs/sdk_triage_bot needs: - job_001 - job_006: + job_007: name: "analyze_and_format; Dart dev; PKGS: pkgs/corpus, pkgs/dart_flutter_team_lints, pkgs/firehose, pkgs/repo_manage, pkgs/sdk_triage_bot; `dart format --output=none --set-exit-if-changed .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/corpus-pkgs/dart_flutter_team_lints-pkgs/firehose-pkgs/repo_manage-pkgs/sdk_triage_bot;commands:format" @@ -235,12 +258,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_corpus_pub_upgrade name: pkgs/corpus; dart pub upgrade run: dart pub upgrade @@ -288,12 +311,12 @@ jobs: working-directory: pkgs/sdk_triage_bot needs: - job_001 - job_007: + job_008: name: "unit_test; Dart 3.1.0; PKG: pkgs/corpus; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:pkgs/corpus;commands:test_1" @@ -303,12 +326,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: "3.1.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_corpus_pub_upgrade name: pkgs/corpus; dart pub upgrade run: dart pub upgrade @@ -325,12 +348,13 @@ jobs: - job_004 - job_005 - job_006 - job_008: + - job_007 + job_009: name: "unit_test; Dart 3.1.0; PKG: pkgs/firehose; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.1.0;packages:pkgs/firehose;commands:test_1" @@ -340,12 +364,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: "3.1.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_firehose_pub_upgrade name: pkgs/firehose; dart pub upgrade run: dart pub upgrade @@ -362,12 +386,13 @@ jobs: - job_004 - job_005 - job_006 - job_009: + - job_007 + job_010: name: "unit_test; Dart 3.4.0; PKG: pkgs/sdk_triage_bot; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/sdk_triage_bot;commands:test_1" @@ -377,12 +402,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: "3.4.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_sdk_triage_bot_pub_upgrade name: pkgs/sdk_triage_bot; dart pub upgrade run: dart pub upgrade @@ -399,12 +424,13 @@ jobs: - job_004 - job_005 - job_006 - job_010: + - job_007 + job_011: name: "unit_test; Dart 3.5.0; PKG: pkgs/dart_flutter_team_lints; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0;packages:pkgs/dart_flutter_team_lints;commands:test_1" @@ -414,12 +440,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: "3.5.0" - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_dart_flutter_team_lints_pub_upgrade name: pkgs/dart_flutter_team_lints; dart pub upgrade run: dart pub upgrade @@ -436,12 +462,13 @@ jobs: - job_004 - job_005 - job_006 - job_011: + - job_007 + job_012: name: "unit_test; Dart dev; PKG: pkgs/corpus; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/corpus;commands:test_1" @@ -451,12 +478,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_corpus_pub_upgrade name: pkgs/corpus; dart pub upgrade run: dart pub upgrade @@ -473,12 +500,13 @@ jobs: - job_004 - job_005 - job_006 - job_012: + - job_007 + job_013: name: "unit_test; Dart dev; PKG: pkgs/dart_flutter_team_lints; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/dart_flutter_team_lints;commands:test_1" @@ -488,12 +516,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_dart_flutter_team_lints_pub_upgrade name: pkgs/dart_flutter_team_lints; dart pub upgrade run: dart pub upgrade @@ -510,12 +538,13 @@ jobs: - job_004 - job_005 - job_006 - job_013: + - job_007 + job_014: name: "unit_test; Dart dev; PKG: pkgs/firehose; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/firehose;commands:test_1" @@ -525,12 +554,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_firehose_pub_upgrade name: pkgs/firehose; dart pub upgrade run: dart pub upgrade @@ -547,12 +576,13 @@ jobs: - job_004 - job_005 - job_006 - job_014: + - job_007 + job_015: name: "unit_test; Dart dev; PKG: pkgs/sdk_triage_bot; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/sdk_triage_bot;commands:test_1" @@ -562,12 +592,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_sdk_triage_bot_pub_upgrade name: pkgs/sdk_triage_bot; dart pub upgrade run: dart pub upgrade @@ -584,12 +614,13 @@ jobs: - job_004 - job_005 - job_006 - job_015: + - job_007 + job_016: name: "analyze_format; Dart dev; PKG: pkgs/blast_repo; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/blast_repo;commands:format-analyze" @@ -599,12 +630,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_blast_repo_pub_upgrade name: pkgs/blast_repo; dart pub upgrade run: dart pub upgrade @@ -633,12 +664,13 @@ jobs: - job_012 - job_013 - job_014 - job_016: + - job_015 + job_017: name: "test; Dart dev; PKG: pkgs/blast_repo; `dart test --test-randomize-ordering-seed=random`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 with: path: "~/.pub-cache/hosted" key: "os:ubuntu-latest;pub-cache-hosted;sdk:dev;packages:pkgs/blast_repo;commands:test_0" @@ -648,12 +680,12 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 + uses: dart-lang/setup-dart@a57a6c04cf7d4840e88432aad6281d1e125f0d46 with: sdk: dev - id: checkout name: Checkout repository - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - id: pkgs_blast_repo_pub_upgrade name: pkgs/blast_repo; dart pub upgrade run: dart pub upgrade @@ -679,3 +711,4 @@ jobs: - job_013 - job_014 - job_015 + - job_016 diff --git a/tool/ci.sh b/tool/ci.sh index 72af8590..9fd92d26 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,10 +1,9 @@ #!/bin/bash -# Created with package:mono_repo v6.6.2 +# Created with package:mono_repo v6.5.1 # Support built in commands on windows out of the box. - # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter pub" is called instead of "dart pub". +# then "flutter" is called instead of "pub". # This assumes that the Flutter SDK has been installed in a previous step. function pub() { if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then @@ -13,13 +12,18 @@ function pub() { command dart pub "$@" fi } - +# When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") +# then "flutter" is called instead of "pub". +# This assumes that the Flutter SDK has been installed in a previous step. function format() { - command dart format "$@" + if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then + command flutter format "$@" + else + command dart format "$@" + fi } - # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter analyze" is called instead of "dart analyze". +# then "flutter" is called instead of "pub". # This assumes that the Flutter SDK has been installed in a previous step. function analyze() { if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then From 49ec7130eb8bdae77eb934ac6b33caf5321cf498 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 2 Sep 2024 09:01:34 +0200 Subject: [PATCH 3/3] Run monorepo --- .github/workflows/dart.yml | 4 ++-- tool/ci.sh | 18 +++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 9c015727..4c574c50 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -1,4 +1,4 @@ -# Created with package:mono_repo v6.5.1 +# Created with package:mono_repo v6.6.2 name: Dart CI on: push: @@ -35,7 +35,7 @@ jobs: name: Checkout repository uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - name: mono_repo self validate - run: dart pub global activate mono_repo 6.5.1 + run: dart pub global activate mono_repo 6.6.2 - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: diff --git a/tool/ci.sh b/tool/ci.sh index 9fd92d26..72af8590 100755 --- a/tool/ci.sh +++ b/tool/ci.sh @@ -1,9 +1,10 @@ #!/bin/bash -# Created with package:mono_repo v6.5.1 +# Created with package:mono_repo v6.6.2 # Support built in commands on windows out of the box. + # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter" is called instead of "pub". +# then "flutter pub" is called instead of "dart pub". # This assumes that the Flutter SDK has been installed in a previous step. function pub() { if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then @@ -12,18 +13,13 @@ function pub() { command dart pub "$@" fi } -# When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter" is called instead of "pub". -# This assumes that the Flutter SDK has been installed in a previous step. + function format() { - if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then - command flutter format "$@" - else - command dart format "$@" - fi + command dart format "$@" } + # When it is a flutter repo (check the pubspec.yaml for "sdk: flutter") -# then "flutter" is called instead of "pub". +# then "flutter analyze" is called instead of "dart analyze". # This assumes that the Flutter SDK has been installed in a previous step. function analyze() { if grep -Fq "sdk: flutter" "${PWD}/pubspec.yaml"; then