From e1f37c02c33a88cc66d70804ff76d437bc60b3b3 Mon Sep 17 00:00:00 2001 From: Keal Jones Date: Wed, 26 Mar 2025 11:25:59 -0700 Subject: [PATCH 1/4] see if this fixes dart 3 --- .github/workflows/dart_ci.yaml | 6 ++---- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dart_ci.yaml b/.github/workflows/dart_ci.yaml index 839b174..18680fd 100644 --- a/.github/workflows/dart_ci.yaml +++ b/.github/workflows/dart_ci.yaml @@ -25,9 +25,8 @@ jobs: strategy: fail-fast: false matrix: - sdk: [ 2.19.6 ] # TODO: Add stable and beta sdk's as a separate effort (FEDX-1911)[https://jira.atl.workiva.net/browse/FEDX-1911] - # sdk: [ 2.19.6, stable, beta ] + sdk: [ 2.19.6, stable, beta ] steps: - uses: actions/checkout@v4 - uses: dart-lang/setup-dart@v1 @@ -48,9 +47,8 @@ jobs: strategy: fail-fast: false matrix: - sdk: [ 2.19.6 ] # TODO: Add stable and beta sdk's as a separate effort (FEDX-1911)[https://jira.atl.workiva.net/browse/FEDX-1911] - # sdk: [ 2.19.6, stable, beta ] + sdk: [ 2.19.6, stable, beta ] steps: - uses: actions/checkout@v4 - uses: dart-lang/setup-dart@v1 diff --git a/pubspec.yaml b/pubspec.yaml index 1fae376..cc700a3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -20,7 +20,7 @@ dependencies: json_annotation: ^4.1.0 path: ^1.8.0 test: ^1.17.12 - test_core: ">=0.4.2 <0.6.0" + test_core: ">=0.4.2 <0.7.0" yaml: ^3.1.0 dev_dependencies: From 118fa9964f7811d57715a6b8de9cb51e3184ce23 Mon Sep 17 00:00:00 2001 From: Keal Jones Date: Wed, 26 Mar 2025 11:48:06 -0700 Subject: [PATCH 2/4] try adding --delete-conflicting-outputs --- bin/browser_aggregate_tests.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/browser_aggregate_tests.dart b/bin/browser_aggregate_tests.dart index 5091d92..bae3ed1 100644 --- a/bin/browser_aggregate_tests.dart +++ b/bin/browser_aggregate_tests.dart @@ -171,6 +171,7 @@ Future buildTests(List testPaths, 'run', 'build_runner', 'build', + '--delete-conflicting-outputs', ...buildRunnerBuildArgs(testPaths, release: release, userBuildArgs: userBuildArgs), ]; From f0692d344acb7aba753cc56393c2b39a0206c83f Mon Sep 17 00:00:00 2001 From: Keal Jones Date: Wed, 26 Mar 2025 11:51:19 -0700 Subject: [PATCH 3/4] update tests --- test/bin/browser_aggregate_tests_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/bin/browser_aggregate_tests_test.dart b/test/bin/browser_aggregate_tests_test.dart index 79c5b45..4abcd9d 100644 --- a/test/bin/browser_aggregate_tests_test.dart +++ b/test/bin/browser_aggregate_tests_test.dart @@ -95,7 +95,7 @@ void main() { emitsThrough('Reading browser aggregate test config...'), emitsThrough('Found 1 aggregate tests to run.'), emitsThrough( - 'dart run build_runner build --build-filter=test/templates/default_template.browser_aggregate_test.**'), + 'dart run build_runner build --delete-conflicting-outputs --build-filter=test/templates/default_template.browser_aggregate_test.**'), emitsThrough(contains('Succeeded')), ])); await process.shouldExit(0); @@ -116,7 +116,7 @@ void main() { emitsThrough('Reading browser aggregate test config...'), emitsThrough('Found 1 aggregate tests to run.'), emitsThrough( - 'dart run build_runner build -c custom --release --build-filter=test/templates/default_template.browser_aggregate_test.**'), + 'dart run build_runner build --delete-conflicting-outputs -c custom --release --build-filter=test/templates/default_template.browser_aggregate_test.**'), emitsThrough(contains('Succeeded')), ])); await process.shouldExit(0); From cfdf6e3462ae081e16309debf773e17139f1cb3e Mon Sep 17 00:00:00 2001 From: Keal Jones Date: Wed, 26 Mar 2025 12:02:41 -0700 Subject: [PATCH 4/4] remove outdated comment --- .github/workflows/dart_ci.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/dart_ci.yaml b/.github/workflows/dart_ci.yaml index 18680fd..f22689a 100644 --- a/.github/workflows/dart_ci.yaml +++ b/.github/workflows/dart_ci.yaml @@ -25,7 +25,6 @@ jobs: strategy: fail-fast: false matrix: - # TODO: Add stable and beta sdk's as a separate effort (FEDX-1911)[https://jira.atl.workiva.net/browse/FEDX-1911] sdk: [ 2.19.6, stable, beta ] steps: - uses: actions/checkout@v4 @@ -47,7 +46,6 @@ jobs: strategy: fail-fast: false matrix: - # TODO: Add stable and beta sdk's as a separate effort (FEDX-1911)[https://jira.atl.workiva.net/browse/FEDX-1911] sdk: [ 2.19.6, stable, beta ] steps: - uses: actions/checkout@v4