From 21c3cc09f62388d3f831de7f529a3742b00c7984 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 6 Mar 2023 11:59:48 -0800 Subject: [PATCH 1/4] dogfood the new setup-dart action --- .github/workflows/dart.yml | 82 +++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 40 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 00dd0792e..25f6f08b3 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -30,7 +30,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: stable - id: checkout @@ -38,8 +38,10 @@ jobs: uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b - name: mono_repo self validate run: dart pub global activate mono_repo 6.4.3 - - name: mono_repo self validate - run: dart pub global run mono_repo generate --validate + # TODO: revert this changes after closing + # https://github.com/dart-lang/setup-dart/issues/79 + # - name: mono_repo self validate + # run: dart pub global run mono_repo generate --validate job_002: name: "analyzer_and_format; linux; Dart dev; PKG: dwds; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos .`, `dart test test/build/ensure_version_test.dart`" runs-on: ubuntu-latest @@ -55,7 +57,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -93,7 +95,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -179,7 +181,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -217,7 +219,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -256,7 +258,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -291,7 +293,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -326,7 +328,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -361,7 +363,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -396,7 +398,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -435,7 +437,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -474,7 +476,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -513,7 +515,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -548,7 +550,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -583,7 +585,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -618,7 +620,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -653,7 +655,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -692,7 +694,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -721,7 +723,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -746,7 +748,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -771,7 +773,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -796,7 +798,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -821,7 +823,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -846,7 +848,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -871,7 +873,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: dev - id: checkout @@ -896,7 +898,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -921,7 +923,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -946,7 +948,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -971,7 +973,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -996,7 +998,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -1021,7 +1023,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -1046,7 +1048,7 @@ jobs: runs-on: windows-latest steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: main - id: checkout @@ -1082,7 +1084,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: beta - id: checkout @@ -1150,7 +1152,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: beta - id: checkout @@ -1218,7 +1220,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: beta - id: checkout @@ -1282,7 +1284,7 @@ jobs: os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: beta - id: checkout @@ -1336,7 +1338,7 @@ jobs: if: "github.event_name == 'schedule'" steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: beta - id: checkout @@ -1390,7 +1392,7 @@ jobs: if: "github.event_name == 'schedule'" steps: - name: Setup Dart SDK - uses: dart-lang/setup-dart@6a218f2413a3e78e9087f638a238f6b40893203d + uses: dart-lang/setup-dart@929ed5f8bae55086c6fac456ba5acb9763c9e3e2 with: sdk: beta - id: checkout From 5c8e07e42c1f8c4b319d35665d5046ecd04afe25 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 6 Mar 2023 12:03:16 -0800 Subject: [PATCH 2/4] update the labeler.yml file --- .github/labeler.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 2441dac13..a1607fea1 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -12,8 +12,6 @@ 'package:webdev': - webdev/**/* -'dart-debug-extension': - - dwds/debug_extension_mv3 - 'dart-debug-extension': - dwds/debug_extension + - dwds/debug_extension_mv3 From c2a2a3e4a9c559ae3ec5490c86fbe318d8f88a26 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 6 Mar 2023 12:10:49 -0800 Subject: [PATCH 3/4] more tweaks to the labeling config --- .github/labeler.yml | 4 ++-- .github/workflows/pull_request_label.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index a1607fea1..dee409fe3 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -13,5 +13,5 @@ - webdev/**/* 'dart-debug-extension': - - dwds/debug_extension - - dwds/debug_extension_mv3 + - dwds/debug_extension/**/* + - dwds/debug_extension_mv3/**/* diff --git a/.github/workflows/pull_request_label.yml b/.github/workflows/pull_request_label.yml index 26758a596..b83b001cb 100644 --- a/.github/workflows/pull_request_label.yml +++ b/.github/workflows/pull_request_label.yml @@ -8,7 +8,8 @@ name: Pull Request Labeler permissions: read-all on: - pull_request_target + pull_request: + branches: [ master ] jobs: label: From 8a814ca8c340a543426dc4e0456594192b6c7b32 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 6 Mar 2023 12:14:00 -0800 Subject: [PATCH 4/4] revert pull_request_label.yml change --- .github/workflows/pull_request_label.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pull_request_label.yml b/.github/workflows/pull_request_label.yml index b83b001cb..26758a596 100644 --- a/.github/workflows/pull_request_label.yml +++ b/.github/workflows/pull_request_label.yml @@ -8,8 +8,7 @@ name: Pull Request Labeler permissions: read-all on: - pull_request: - branches: [ master ] + pull_request_target jobs: label: