From ad2a4cb46a68168797db8d6a2969be0e8946a59d Mon Sep 17 00:00:00 2001 From: Rexios Date: Mon, 10 Jun 2024 09:38:57 -0400 Subject: [PATCH 1/9] Bump min Dart version to 3.4.0 for WASM Before 3.4.0: ```console Could not find an option with short name "-O". Usage: dart compile wasm [arguments] ``` This option was added in commit [92d53c426f9b4764e5c34d33ef7bbcf5fd3b12a6](https://github.com/dart-lang/sdk/commit/92d53c426f9b4764e5c34d33ef7bbcf5fd3b12a6) --- pkgs/test/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/pubspec.yaml b/pkgs/test/pubspec.yaml index 9037cf178..0f216d1be 100644 --- a/pkgs/test/pubspec.yaml +++ b/pkgs/test/pubspec.yaml @@ -5,7 +5,7 @@ description: >- repository: https://github.com/dart-lang/test/tree/master/pkgs/test environment: - sdk: ^3.2.0 + sdk: ^3.4.0 dependencies: analyzer: '>=5.12.0 <7.0.0' From 80835681ce6ce87f0f866ffb2ab0283e6d4d11d6 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 10 Jun 2024 14:44:57 +0000 Subject: [PATCH 2/9] update changelog/pubspec --- pkgs/test/CHANGELOG.md | 4 ++++ pkgs/test/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/test/CHANGELOG.md b/pkgs/test/CHANGELOG.md index 0bb81cdc3..dfcd704cd 100644 --- a/pkgs/test/CHANGELOG.md +++ b/pkgs/test/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.25.8-wip + +* Increase SDK constraint to ^3.4.0. + ## 1.25.7 * Enable asserts for `dart2wasm` tests. diff --git a/pkgs/test/pubspec.yaml b/pkgs/test/pubspec.yaml index 0f216d1be..43da9eefd 100644 --- a/pkgs/test/pubspec.yaml +++ b/pkgs/test/pubspec.yaml @@ -1,5 +1,5 @@ name: test -version: 1.25.7 +version: 1.25.8-wip description: >- A full featured library for writing and running Dart tests across platforms. repository: https://github.com/dart-lang/test/tree/master/pkgs/test From 49e9451ada98ec76f835ca528e17120f460145c8 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 10 Jun 2024 14:48:19 +0000 Subject: [PATCH 3/9] re-run mono_repo generate --- .github/workflows/dart.yml | 188 ++++++++++++++++++------------------- 1 file changed, 94 insertions(+), 94 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 38f16a1f1..40ee88a27 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -308,16 +308,16 @@ jobs: - job_003 - job_004 job_007: - name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`" + name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test_api; `dart test --preset travis -x browser`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test;commands:command_02" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test_api;commands:command_12" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test_api os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -328,108 +328,112 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - id: pkgs_test_pub_upgrade - name: pkgs/test; dart pub upgrade + - id: pkgs_test_api_pub_upgrade + name: pkgs/test_api; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/test - - name: "pkgs/test; xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0" - run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0" - if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/test + working-directory: pkgs/test_api + - name: "pkgs/test_api; dart test --preset travis -x browser" + run: dart test --preset travis -x browser + if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/test_api needs: - job_001 - job_002 - job_003 - job_004 job_008: - name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`" + name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/regression; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test;commands:command_03" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/regression;commands:command_01" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/regression + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - id: pkgs_test_pub_upgrade - name: pkgs/test; dart pub upgrade + - id: integration_tests_regression_pub_upgrade + name: integration_tests/regression; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/test - - name: "pkgs/test; xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1" - run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1" - if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/test + working-directory: integration_tests/regression + - name: integration_tests/regression; dart test + run: dart test + if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" + working-directory: integration_tests/regression needs: - job_001 - job_002 - job_003 - job_004 job_009: - name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`" + name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/wasm; `pushd /tmp && wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb && sudo dpkg -i google-chrome-beta_current_amd64.deb && popd && which google-chrome-beta`, `dart test --timeout=60s`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test;commands:command_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/wasm;commands:command_00-test_2" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/wasm + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - id: pkgs_test_pub_upgrade - name: pkgs/test; dart pub upgrade + - id: integration_tests_wasm_pub_upgrade + name: integration_tests/wasm; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/test - - name: "pkgs/test; xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2" - run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2" - if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/test + working-directory: integration_tests/wasm + - name: "integration_tests/wasm; pushd /tmp && wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb && sudo dpkg -i google-chrome-beta_current_amd64.deb && popd && which google-chrome-beta" + run: "pushd /tmp && wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb && sudo dpkg -i google-chrome-beta_current_amd64.deb && popd && which google-chrome-beta" + if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" + working-directory: integration_tests/wasm + - name: "integration_tests/wasm; dart test --timeout=60s" + run: "dart test --timeout=60s" + if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" + working-directory: integration_tests/wasm needs: - job_001 - job_002 - job_003 - job_004 job_010: - name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`" + name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test;commands:command_05" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test;commands:command_02" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 @@ -438,8 +442,8 @@ jobs: run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" working-directory: pkgs/test - - name: "pkgs/test; xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3" - run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3" + - name: "pkgs/test; xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0" + run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0" if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: @@ -448,23 +452,23 @@ jobs: - job_003 - job_004 job_011: - name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`" + name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test;commands:command_06" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test;commands:command_03" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 @@ -473,8 +477,8 @@ jobs: run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" working-directory: pkgs/test - - name: "pkgs/test; xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4" - run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4" + - name: "pkgs/test; xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1" + run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1" if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test needs: @@ -483,51 +487,51 @@ jobs: - job_003 - job_004 job_012: - name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test_api; `dart test --preset travis -x browser`" + name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test_api;commands:command_12" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test;commands:command_04" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test_api - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - id: pkgs_test_api_pub_upgrade - name: pkgs/test_api; dart pub upgrade + - id: pkgs_test_pub_upgrade + name: pkgs/test; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/test_api - - name: "pkgs/test_api; dart test --preset travis -x browser" - run: dart test --preset travis -x browser - if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/test_api + working-directory: pkgs/test + - name: "pkgs/test; xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2" + run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2" + if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/test needs: - job_001 - job_002 - job_003 - job_004 job_013: - name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/regression; `dart test`" + name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/regression;commands:command_01" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test;commands:command_05" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/regression + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -538,31 +542,31 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - id: integration_tests_regression_pub_upgrade - name: integration_tests/regression; dart pub upgrade + - id: pkgs_test_pub_upgrade + name: pkgs/test; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: integration_tests/regression - - name: integration_tests/regression; dart test - run: dart test - if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" - working-directory: integration_tests/regression + working-directory: pkgs/test + - name: "pkgs/test; xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3" + run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3" + if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/test needs: - job_001 - job_002 - job_003 - job_004 job_014: - name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/wasm; `pushd /tmp && wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb && sudo dpkg -i google-chrome-beta_current_amd64.deb && popd && which google-chrome-beta`, `dart test --timeout=60s`" + name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/wasm;commands:command_00-test_2" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test;commands:command_06" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/wasm + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -573,19 +577,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - id: integration_tests_wasm_pub_upgrade - name: integration_tests/wasm; dart pub upgrade + - id: pkgs_test_pub_upgrade + name: pkgs/test; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: integration_tests/wasm - - name: "integration_tests/wasm; pushd /tmp && wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb && sudo dpkg -i google-chrome-beta_current_amd64.deb && popd && which google-chrome-beta" - run: "pushd /tmp && wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb && sudo dpkg -i google-chrome-beta_current_amd64.deb && popd && which google-chrome-beta" - if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" - working-directory: integration_tests/wasm - - name: "integration_tests/wasm; dart test --timeout=60s" - run: "dart test --timeout=60s" - if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" - working-directory: integration_tests/wasm + working-directory: pkgs/test + - name: "pkgs/test; xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4" + run: "xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4" + if: "always() && steps.pkgs_test_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/test needs: - job_001 - job_002 @@ -971,13 +971,13 @@ jobs: - job_003 - job_004 job_026: - name: "unit_test; windows; Dart 3.2.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`" + name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 @@ -996,13 +996,13 @@ jobs: - job_003 - job_004 job_027: - name: "unit_test; windows; Dart 3.2.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`" + name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 @@ -1021,13 +1021,13 @@ jobs: - job_003 - job_004 job_028: - name: "unit_test; windows; Dart 3.2.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`" + name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 @@ -1046,13 +1046,13 @@ jobs: - job_003 - job_004 job_029: - name: "unit_test; windows; Dart 3.2.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`" + name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 @@ -1071,13 +1071,13 @@ jobs: - job_003 - job_004 job_030: - name: "unit_test; windows; Dart 3.2.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`" + name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 From 7bfd55fe0356bccf95773ad43285476eb12911a7 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 10 Jun 2024 14:49:43 +0000 Subject: [PATCH 4/9] update test_core and test_api as well --- pkgs/test/pubspec.yaml | 4 ++-- pkgs/test_api/CHANGELOG.md | 4 ++++ pkgs/test_api/pubspec.yaml | 4 ++-- pkgs/test_core/CHANGELOG.md | 4 ++++ pkgs/test_core/pubspec.yaml | 4 ++-- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/test/pubspec.yaml b/pkgs/test/pubspec.yaml index 43da9eefd..e4d425bfc 100644 --- a/pkgs/test/pubspec.yaml +++ b/pkgs/test/pubspec.yaml @@ -34,8 +34,8 @@ dependencies: stream_channel: ^2.1.0 # Use an exact version until the test_api and test_core package are stable. - test_api: 0.7.2 - test_core: 0.6.4 + test_api: 0.7.3 + test_core: 0.6.5 typed_data: ^1.3.0 web_socket_channel: '>=2.0.0 <4.0.0' diff --git a/pkgs/test_api/CHANGELOG.md b/pkgs/test_api/CHANGELOG.md index 56050d738..24646b2fa 100644 --- a/pkgs/test_api/CHANGELOG.md +++ b/pkgs/test_api/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.7.3-wip + +* Increase SDK constraint to ^3.4.0. + ## 0.7.2 * Update min SDK constraint to 3.2.0. diff --git a/pkgs/test_api/pubspec.yaml b/pkgs/test_api/pubspec.yaml index fd9a94872..de874a5ba 100644 --- a/pkgs/test_api/pubspec.yaml +++ b/pkgs/test_api/pubspec.yaml @@ -1,11 +1,11 @@ name: test_api -version: 0.7.2 +version: 0.7.3-wip description: >- The user facing API for structuring Dart tests and checking expectations. repository: https://github.com/dart-lang/test/tree/master/pkgs/test_api environment: - sdk: ^3.2.0 + sdk: ^3.4.0 dependencies: async: ^2.5.0 diff --git a/pkgs/test_core/CHANGELOG.md b/pkgs/test_core/CHANGELOG.md index cd058d450..6110d421f 100644 --- a/pkgs/test_core/CHANGELOG.md +++ b/pkgs/test_core/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.5-wip + +* Increase SDK constraint to ^3.4.0. + ## 0.6.4 * Enable asserts for `dart2wasm` tests. diff --git a/pkgs/test_core/pubspec.yaml b/pkgs/test_core/pubspec.yaml index 0deb5aca1..1e50bc6f8 100644 --- a/pkgs/test_core/pubspec.yaml +++ b/pkgs/test_core/pubspec.yaml @@ -1,10 +1,10 @@ name: test_core -version: 0.6.4 +version: 0.6.5-wip description: A basic library for writing tests and running them on the VM. repository: https://github.com/dart-lang/test/tree/master/pkgs/test_core environment: - sdk: ^3.2.0 + sdk: ^3.4.0 dependencies: analyzer: '>=3.3.0 <7.0.0' From d457db29907788d496e2868356c3fbd47a89ccf3 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 10 Jun 2024 14:50:07 +0000 Subject: [PATCH 5/9] rerun mono_repo generate again --- .github/workflows/dart.yml | 181 +++++++++++++++++++++++-------------- 1 file changed, 115 insertions(+), 66 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 40ee88a27..470dc4150 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -40,16 +40,16 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; linux; Dart 3.2.0; PKGS: pkgs/checks, pkgs/test_core; `dart analyze`" + name: "analyze_and_format; linux; Dart 3.2.0; PKG: pkgs/checks; `dart analyze`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks-pkgs/test_core;commands:analyze_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks;commands:analyze_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks-pkgs/test_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -69,15 +69,6 @@ jobs: run: dart analyze if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" working-directory: pkgs/checks - - id: pkgs_test_core_pub_upgrade - name: pkgs/test_core; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/test_core - - name: pkgs/test_core; dart analyze - run: dart analyze - if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/test_core job_003: name: "analyze_and_format; linux; Dart 3.4.0; PKGS: integration_tests/regression, integration_tests/wasm; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" runs-on: ubuntu-latest @@ -126,6 +117,36 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm job_004: + name: "analyze_and_format; linux; Dart 3.4.0; PKG: pkgs/test_core; `dart analyze`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test_core;commands:analyze_1" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + with: + sdk: "3.4.0" + - id: checkout + name: Checkout repository + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + - id: pkgs_test_core_pub_upgrade + name: pkgs/test_core; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/test_core + - name: pkgs/test_core; dart analyze + run: dart analyze + if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/test_core + job_005: name: "analyze_and_format; linux; Dart dev; PKGS: integration_tests/regression, integration_tests/spawn_hybrid, integration_tests/wasm, pkgs/checks, pkgs/test, pkgs/test_api, pkgs/test_core; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" runs-on: ubuntu-latest steps: @@ -237,7 +258,7 @@ jobs: run: dart analyze --fatal-infos if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core - job_005: + job_006: name: "unit_test; linux; Dart 3.2.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" runs-on: ubuntu-latest steps: @@ -272,7 +293,8 @@ jobs: - job_002 - job_003 - job_004 - job_006: + - job_005 + job_007: name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/checks; `dart test`" runs-on: ubuntu-latest steps: @@ -307,41 +329,7 @@ jobs: - job_002 - job_003 - job_004 - job_007: - name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/test_api; `dart test --preset travis -x browser`" - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test_api;commands:command_12" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/test_api - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 - with: - sdk: "3.2.0" - - id: checkout - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - id: pkgs_test_api_pub_upgrade - name: pkgs/test_api; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/test_api - - name: "pkgs/test_api; dart test --preset travis -x browser" - run: dart test --preset travis -x browser - if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/test_api - needs: - - job_001 - - job_002 - - job_003 - - job_004 + - job_005 job_008: name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/regression; `dart test`" runs-on: ubuntu-latest @@ -377,6 +365,7 @@ jobs: - job_002 - job_003 - job_004 + - job_005 job_009: name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/wasm; `pushd /tmp && wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb && sudo dpkg -i google-chrome-beta_current_amd64.deb && popd && which google-chrome-beta`, `dart test --timeout=60s`" runs-on: ubuntu-latest @@ -416,6 +405,7 @@ jobs: - job_002 - job_003 - job_004 + - job_005 job_010: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`" runs-on: ubuntu-latest @@ -451,6 +441,7 @@ jobs: - job_002 - job_003 - job_004 + - job_005 job_011: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`" runs-on: ubuntu-latest @@ -486,6 +477,7 @@ jobs: - job_002 - job_003 - job_004 + - job_005 job_012: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`" runs-on: ubuntu-latest @@ -521,6 +513,7 @@ jobs: - job_002 - job_003 - job_004 + - job_005 job_013: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`" runs-on: ubuntu-latest @@ -556,6 +549,7 @@ jobs: - job_002 - job_003 - job_004 + - job_005 job_014: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`" runs-on: ubuntu-latest @@ -591,7 +585,44 @@ jobs: - job_002 - job_003 - job_004 + - job_005 job_015: + name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test_api; `dart test --preset travis -x browser`" + runs-on: ubuntu-latest + steps: + - name: Cache Pub hosted dependencies + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 + with: + path: "~/.pub-cache/hosted" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test_api;commands:command_12" + restore-keys: | + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test_api + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted + os:ubuntu-latest + - name: Setup Dart SDK + uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 + with: + sdk: "3.4.0" + - id: checkout + name: Checkout repository + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + - id: pkgs_test_api_pub_upgrade + name: pkgs/test_api; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/test_api + - name: "pkgs/test_api; dart test --preset travis -x browser" + run: dart test --preset travis -x browser + if: "always() && steps.pkgs_test_api_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/test_api + needs: + - job_001 + - job_002 + - job_003 + - job_004 + - job_005 + job_016: name: "unit_test; linux; Dart dev; PKG: integration_tests/regression; `dart test`" runs-on: ubuntu-latest steps: @@ -626,7 +657,8 @@ jobs: - job_002 - job_003 - job_004 - job_016: + - job_005 + job_017: name: "unit_test; linux; Dart dev; PKG: pkgs/checks; `dart test`" runs-on: ubuntu-latest steps: @@ -661,7 +693,8 @@ jobs: - job_002 - job_003 - job_004 - job_017: + - job_005 + job_018: name: "unit_test; linux; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" runs-on: ubuntu-latest steps: @@ -696,7 +729,8 @@ jobs: - job_002 - job_003 - job_004 - job_018: + - job_005 + job_019: name: "unit_test; linux; Dart dev; PKG: integration_tests/wasm; `pushd /tmp && wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb && sudo dpkg -i google-chrome-beta_current_amd64.deb && popd && which google-chrome-beta`, `dart test --timeout=60s`" runs-on: ubuntu-latest steps: @@ -735,7 +769,8 @@ jobs: - job_002 - job_003 - job_004 - job_019: + - job_005 + job_020: name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`" runs-on: ubuntu-latest steps: @@ -770,7 +805,8 @@ jobs: - job_002 - job_003 - job_004 - job_020: + - job_005 + job_021: name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`" runs-on: ubuntu-latest steps: @@ -805,7 +841,8 @@ jobs: - job_002 - job_003 - job_004 - job_021: + - job_005 + job_022: name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`" runs-on: ubuntu-latest steps: @@ -840,7 +877,8 @@ jobs: - job_002 - job_003 - job_004 - job_022: + - job_005 + job_023: name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`" runs-on: ubuntu-latest steps: @@ -875,7 +913,8 @@ jobs: - job_002 - job_003 - job_004 - job_023: + - job_005 + job_024: name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`" runs-on: ubuntu-latest steps: @@ -910,7 +949,8 @@ jobs: - job_002 - job_003 - job_004 - job_024: + - job_005 + job_025: name: "unit_test; linux; Dart dev; PKG: pkgs/test_api; `dart test --preset travis -x browser`" runs-on: ubuntu-latest steps: @@ -945,7 +985,8 @@ jobs: - job_002 - job_003 - job_004 - job_025: + - job_005 + job_026: name: "unit_test; windows; Dart 3.2.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" runs-on: windows-latest steps: @@ -970,7 +1011,8 @@ jobs: - job_002 - job_003 - job_004 - job_026: + - job_005 + job_027: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`" runs-on: windows-latest steps: @@ -995,7 +1037,8 @@ jobs: - job_002 - job_003 - job_004 - job_027: + - job_005 + job_028: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`" runs-on: windows-latest steps: @@ -1020,7 +1063,8 @@ jobs: - job_002 - job_003 - job_004 - job_028: + - job_005 + job_029: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`" runs-on: windows-latest steps: @@ -1045,7 +1089,8 @@ jobs: - job_002 - job_003 - job_004 - job_029: + - job_005 + job_030: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`" runs-on: windows-latest steps: @@ -1070,7 +1115,8 @@ jobs: - job_002 - job_003 - job_004 - job_030: + - job_005 + job_031: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`" runs-on: windows-latest steps: @@ -1095,7 +1141,8 @@ jobs: - job_002 - job_003 - job_004 - job_031: + - job_005 + job_032: name: "unit_test; windows; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" runs-on: windows-latest steps: @@ -1120,7 +1167,8 @@ jobs: - job_002 - job_003 - job_004 - job_032: + - job_005 + job_033: name: Notify failure runs-on: ubuntu-latest if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()" @@ -1163,3 +1211,4 @@ jobs: - job_029 - job_030 - job_031 + - job_032 From 78fbe9483753dce9bb8d836675664679dfa6519a Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 10 Jun 2024 14:54:00 +0000 Subject: [PATCH 6/9] update a few more packages to require 3.4.0 and regenerate --- .github/workflows/dart.yml | 191 ++++++++------------ integration_tests/spawn_hybrid/pubspec.yaml | 2 +- pkgs/checks/CHANGELOG.md | 2 +- pkgs/checks/pubspec.yaml | 2 +- 4 files changed, 74 insertions(+), 123 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 470dc4150..b8b1b5fcb 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -40,36 +40,6 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - name: "analyze_and_format; linux; Dart 3.2.0; PKG: pkgs/checks; `dart analyze`" - runs-on: ubuntu-latest - steps: - - name: Cache Pub hosted dependencies - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 - with: - path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks;commands:analyze_1" - restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 - os:ubuntu-latest;pub-cache-hosted - os:ubuntu-latest - - name: Setup Dart SDK - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 - with: - sdk: "3.2.0" - - id: checkout - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - id: pkgs_checks_pub_upgrade - name: pkgs/checks; dart pub upgrade - run: dart pub upgrade - if: "always() && steps.checkout.conclusion == 'success'" - working-directory: pkgs/checks - - name: pkgs/checks; dart analyze - run: dart analyze - if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" - working-directory: pkgs/checks - job_003: name: "analyze_and_format; linux; Dart 3.4.0; PKGS: integration_tests/regression, integration_tests/wasm; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" runs-on: ubuntu-latest steps: @@ -116,17 +86,17 @@ jobs: run: dart analyze --fatal-infos if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm - job_004: - name: "analyze_and_format; linux; Dart 3.4.0; PKG: pkgs/test_core; `dart analyze`" + job_003: + name: "analyze_and_format; linux; Dart 3.4.0; PKGS: pkgs/checks, pkgs/test_core; `dart analyze`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test_core;commands:analyze_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/checks-pkgs/test_core;commands:analyze_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/test_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/checks-pkgs/test_core os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -137,6 +107,15 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 + - id: pkgs_checks_pub_upgrade + name: pkgs/checks; dart pub upgrade + run: dart pub upgrade + if: "always() && steps.checkout.conclusion == 'success'" + working-directory: pkgs/checks + - name: pkgs/checks; dart analyze + run: dart analyze + if: "always() && steps.pkgs_checks_pub_upgrade.conclusion == 'success'" + working-directory: pkgs/checks - id: pkgs_test_core_pub_upgrade name: pkgs/test_core; dart pub upgrade run: dart pub upgrade @@ -146,7 +125,7 @@ jobs: run: dart analyze if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core - job_005: + job_004: name: "analyze_and_format; linux; Dart dev; PKGS: integration_tests/regression, integration_tests/spawn_hybrid, integration_tests/wasm, pkgs/checks, pkgs/test, pkgs/test_api, pkgs/test_core; `dart format --output=none --set-exit-if-changed .`, `dart analyze --fatal-infos`" runs-on: ubuntu-latest steps: @@ -258,60 +237,59 @@ jobs: run: dart analyze --fatal-infos if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core - job_006: - name: "unit_test; linux; Dart 3.2.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" + job_005: + name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/regression; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:integration_tests/spawn_hybrid;commands:test_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/regression;commands:command_01" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:integration_tests/spawn_hybrid - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/regression + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - id: integration_tests_spawn_hybrid_pub_upgrade - name: integration_tests/spawn_hybrid; dart pub upgrade + - id: integration_tests_regression_pub_upgrade + name: integration_tests/regression; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: integration_tests/spawn_hybrid - - name: "integration_tests/spawn_hybrid; dart test -p chrome,vm,node" - run: "dart test -p chrome,vm,node" - if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" - working-directory: integration_tests/spawn_hybrid + working-directory: integration_tests/regression + - name: integration_tests/regression; dart test + run: dart test + if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" + working-directory: integration_tests/regression needs: - job_001 - job_002 - job_003 - job_004 - - job_005 - job_007: - name: "unit_test; linux; Dart 3.2.0; PKG: pkgs/checks; `dart test`" + job_006: + name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/checks; `dart test`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks;commands:command_01" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/checks;commands:command_01" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0;packages:pkgs/checks - os:ubuntu-latest;pub-cache-hosted;sdk:3.2.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:pkgs/checks + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 @@ -329,18 +307,17 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_008: - name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/regression; `dart test`" + job_007: + name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" runs-on: ubuntu-latest steps: - name: Cache Pub hosted dependencies uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/regression;commands:command_01" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/spawn_hybrid;commands:test_1" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/regression + os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/spawn_hybrid os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest @@ -351,22 +328,21 @@ jobs: - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 - - id: integration_tests_regression_pub_upgrade - name: integration_tests/regression; dart pub upgrade + - id: integration_tests_spawn_hybrid_pub_upgrade + name: integration_tests/spawn_hybrid; dart pub upgrade run: dart pub upgrade if: "always() && steps.checkout.conclusion == 'success'" - working-directory: integration_tests/regression - - name: integration_tests/regression; dart test - run: dart test - if: "always() && steps.integration_tests_regression_pub_upgrade.conclusion == 'success'" - working-directory: integration_tests/regression + working-directory: integration_tests/spawn_hybrid + - name: "integration_tests/spawn_hybrid; dart test -p chrome,vm,node" + run: "dart test -p chrome,vm,node" + if: "always() && steps.integration_tests_spawn_hybrid_pub_upgrade.conclusion == 'success'" + working-directory: integration_tests/spawn_hybrid needs: - job_001 - job_002 - job_003 - job_004 - - job_005 - job_009: + job_008: name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/wasm; `pushd /tmp && wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb && sudo dpkg -i google-chrome-beta_current_amd64.deb && popd && which google-chrome-beta`, `dart test --timeout=60s`" runs-on: ubuntu-latest steps: @@ -405,8 +381,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_010: + job_009: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`" runs-on: ubuntu-latest steps: @@ -441,8 +416,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_011: + job_010: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`" runs-on: ubuntu-latest steps: @@ -477,8 +451,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_012: + job_011: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`" runs-on: ubuntu-latest steps: @@ -513,8 +486,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_013: + job_012: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`" runs-on: ubuntu-latest steps: @@ -549,8 +521,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_014: + job_013: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`" runs-on: ubuntu-latest steps: @@ -585,8 +556,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_015: + job_014: name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test_api; `dart test --preset travis -x browser`" runs-on: ubuntu-latest steps: @@ -621,8 +591,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_016: + job_015: name: "unit_test; linux; Dart dev; PKG: integration_tests/regression; `dart test`" runs-on: ubuntu-latest steps: @@ -657,8 +626,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_017: + job_016: name: "unit_test; linux; Dart dev; PKG: pkgs/checks; `dart test`" runs-on: ubuntu-latest steps: @@ -693,8 +661,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_018: + job_017: name: "unit_test; linux; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" runs-on: ubuntu-latest steps: @@ -729,8 +696,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_019: + job_018: name: "unit_test; linux; Dart dev; PKG: integration_tests/wasm; `pushd /tmp && wget https://dl.google.com/linux/direct/google-chrome-beta_current_amd64.deb && sudo dpkg -i google-chrome-beta_current_amd64.deb && popd && which google-chrome-beta`, `dart test --timeout=60s`" runs-on: ubuntu-latest steps: @@ -769,8 +735,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_020: + job_019: name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 0`" runs-on: ubuntu-latest steps: @@ -805,8 +770,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_021: + job_020: name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 1`" runs-on: ubuntu-latest steps: @@ -841,8 +805,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_022: + job_021: name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 2`" runs-on: ubuntu-latest steps: @@ -877,8 +840,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_023: + job_022: name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 3`" runs-on: ubuntu-latest steps: @@ -913,8 +875,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_024: + job_023: name: "unit_test; linux; Dart dev; PKG: pkgs/test; `xvfb-run -s \"-screen 0 1024x768x24\" dart test --preset travis --total-shards 5 --shard-index 4`" runs-on: ubuntu-latest steps: @@ -949,8 +910,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_025: + job_024: name: "unit_test; linux; Dart dev; PKG: pkgs/test_api; `dart test --preset travis -x browser`" runs-on: ubuntu-latest steps: @@ -985,15 +945,14 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_026: - name: "unit_test; windows; Dart 3.2.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" + job_025: + name: "unit_test; windows; Dart 3.4.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" runs-on: windows-latest steps: - name: Setup Dart SDK uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30 with: - sdk: "3.2.0" + sdk: "3.4.0" - id: checkout name: Checkout repository uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 @@ -1011,8 +970,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_027: + job_026: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`" runs-on: windows-latest steps: @@ -1037,8 +995,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_028: + job_027: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`" runs-on: windows-latest steps: @@ -1063,8 +1020,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_029: + job_028: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`" runs-on: windows-latest steps: @@ -1089,8 +1045,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_030: + job_029: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`" runs-on: windows-latest steps: @@ -1115,8 +1070,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_031: + job_030: name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`" runs-on: windows-latest steps: @@ -1141,8 +1095,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_032: + job_031: name: "unit_test; windows; Dart dev; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" runs-on: windows-latest steps: @@ -1167,8 +1120,7 @@ jobs: - job_002 - job_003 - job_004 - - job_005 - job_033: + job_032: name: Notify failure runs-on: ubuntu-latest if: "(github.event_name == 'push' || github.event_name == 'schedule') && failure()" @@ -1211,4 +1163,3 @@ jobs: - job_029 - job_030 - job_031 - - job_032 diff --git a/integration_tests/spawn_hybrid/pubspec.yaml b/integration_tests/spawn_hybrid/pubspec.yaml index a8cbbdbae..e0e0b8ee5 100644 --- a/integration_tests/spawn_hybrid/pubspec.yaml +++ b/integration_tests/spawn_hybrid/pubspec.yaml @@ -1,7 +1,7 @@ name: spawn_hybrid publish_to: none environment: - sdk: ^3.2.0 + sdk: ^3.4.0 dependencies: async: ^2.9.0 path: ^1.8.2 diff --git a/pkgs/checks/CHANGELOG.md b/pkgs/checks/CHANGELOG.md index 8ef827eb1..91cc3e986 100644 --- a/pkgs/checks/CHANGELOG.md +++ b/pkgs/checks/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.3.1-wip -- Update min SDK constraint to 3.2.0. +- Update min SDK constraint to 3.4.0. ## 0.3.0 diff --git a/pkgs/checks/pubspec.yaml b/pkgs/checks/pubspec.yaml index 1522ecf29..7a3eb3744 100644 --- a/pkgs/checks/pubspec.yaml +++ b/pkgs/checks/pubspec.yaml @@ -6,7 +6,7 @@ description: >- repository: https://github.com/dart-lang/test/tree/master/pkgs/checks environment: - sdk: ^3.2.0 + sdk: ^3.4.0 dependencies: async: ^2.8.0 From 9deedfee7b3e819a9aa6abeb397d9582a33f76cf Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 10 Jun 2024 14:59:45 +0000 Subject: [PATCH 7/9] update test_api constraint in test_core --- pkgs/test_core/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test_core/pubspec.yaml b/pkgs/test_core/pubspec.yaml index 1e50bc6f8..c1d1c9b0c 100644 --- a/pkgs/test_core/pubspec.yaml +++ b/pkgs/test_core/pubspec.yaml @@ -26,7 +26,7 @@ dependencies: stack_trace: ^1.10.0 stream_channel: ^2.1.0 # Use an exact version until the test_api package is stable. - test_api: 0.7.2 + test_api: 0.7.3 vm_service: ">=6.0.0 <15.0.0" yaml: ^3.0.0 From 902cc05dce6e4dedc44b6293d251c457555d4a08 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 10 Jun 2024 16:23:46 +0000 Subject: [PATCH 8/9] attempt to fix potential race condition --- pkgs/test_core/CHANGELOG.md | 1 + pkgs/test_core/lib/src/runner/vm/test_compiler.dart | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/test_core/CHANGELOG.md b/pkgs/test_core/CHANGELOG.md index 6110d421f..16f1de0ac 100644 --- a/pkgs/test_core/CHANGELOG.md +++ b/pkgs/test_core/CHANGELOG.md @@ -1,6 +1,7 @@ ## 0.6.5-wip * Increase SDK constraint to ^3.4.0. +* Fix race condition when compiling multiple tests at once. ## 0.6.4 diff --git a/pkgs/test_core/lib/src/runner/vm/test_compiler.dart b/pkgs/test_core/lib/src/runner/vm/test_compiler.dart index c34b4f694..eac249ffc 100644 --- a/pkgs/test_core/lib/src/runner/vm/test_compiler.dart +++ b/pkgs/test_core/lib/src/runner/vm/test_compiler.dart @@ -113,8 +113,8 @@ class _TestCompilerForLanguageVersion { try { if (_frontendServerClient == null) { - if (await testCache.exists()) { - await testCache.copy(_outputDill.path); + if (testCache.existsSync()) { + testCache.copySync(_outputDill.path); } compilerOutput = await _createCompiler(tempFile.uri); } else { From eeaabf69ccca13715cc02659102b19a65a05bfb3 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 10 Jun 2024 16:32:28 +0000 Subject: [PATCH 9/9] Revert "attempt to fix potential race condition" This reverts commit 902cc05dce6e4dedc44b6293d251c457555d4a08. --- pkgs/test_core/CHANGELOG.md | 1 - pkgs/test_core/lib/src/runner/vm/test_compiler.dart | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/test_core/CHANGELOG.md b/pkgs/test_core/CHANGELOG.md index 16f1de0ac..6110d421f 100644 --- a/pkgs/test_core/CHANGELOG.md +++ b/pkgs/test_core/CHANGELOG.md @@ -1,7 +1,6 @@ ## 0.6.5-wip * Increase SDK constraint to ^3.4.0. -* Fix race condition when compiling multiple tests at once. ## 0.6.4 diff --git a/pkgs/test_core/lib/src/runner/vm/test_compiler.dart b/pkgs/test_core/lib/src/runner/vm/test_compiler.dart index eac249ffc..c34b4f694 100644 --- a/pkgs/test_core/lib/src/runner/vm/test_compiler.dart +++ b/pkgs/test_core/lib/src/runner/vm/test_compiler.dart @@ -113,8 +113,8 @@ class _TestCompilerForLanguageVersion { try { if (_frontendServerClient == null) { - if (testCache.existsSync()) { - testCache.copySync(_outputDill.path); + if (await testCache.exists()) { + await testCache.copy(_outputDill.path); } compilerOutput = await _createCompiler(tempFile.uri); } else {