From 0aa8ff169b56d0f9b122f1e768aeaa64d210498f Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 2 Jul 2024 20:32:03 +0000 Subject: [PATCH 1/5] use pub workspaces --- integration_tests/regression/pubspec.yaml | 12 ++---------- integration_tests/spawn_hybrid/pubspec.yaml | 11 ++--------- integration_tests/wasm/pubspec.yaml | 11 ++--------- pkgs/checks/pubspec.yaml | 5 ++--- pkgs/checks/pubspec_overrides.yaml | 7 ------- pkgs/test/pubspec.yaml | 8 ++++---- pkgs/test/pubspec_overrides.yaml | 5 ----- pkgs/test_api/pubspec.yaml | 4 ++-- pkgs/test_api/pubspec_overrides.yaml | 6 ------ pkgs/test_core/pubspec.yaml | 6 +++--- pkgs/test_core/pubspec_overrides.yaml | 5 ----- pubspec.yaml | 14 ++++++++++++++ 12 files changed, 31 insertions(+), 63 deletions(-) delete mode 100644 pkgs/checks/pubspec_overrides.yaml delete mode 100644 pkgs/test/pubspec_overrides.yaml delete mode 100644 pkgs/test_api/pubspec_overrides.yaml delete mode 100644 pkgs/test_core/pubspec_overrides.yaml create mode 100644 pubspec.yaml diff --git a/integration_tests/regression/pubspec.yaml b/integration_tests/regression/pubspec.yaml index d039ea04f..6c5b2796d 100644 --- a/integration_tests/regression/pubspec.yaml +++ b/integration_tests/regression/pubspec.yaml @@ -1,15 +1,7 @@ name: regression_tests publish_to: none environment: - sdk: ^3.4.0 + sdk: ^3.5.0-259.0.dev +resolution: workspace dependencies: test: any -dev_dependencies: - dart_flutter_team_lints: ^3.0.0 -dependency_overrides: - test: - path: ../../pkgs/test - test_api: - path: ../../pkgs/test_api - test_core: - path: ../../pkgs/test_core diff --git a/integration_tests/spawn_hybrid/pubspec.yaml b/integration_tests/spawn_hybrid/pubspec.yaml index e0e0b8ee5..e2fa3ee43 100644 --- a/integration_tests/spawn_hybrid/pubspec.yaml +++ b/integration_tests/spawn_hybrid/pubspec.yaml @@ -1,20 +1,13 @@ name: spawn_hybrid publish_to: none environment: - sdk: ^3.4.0 + sdk: ^3.5.0-259.0.dev +resolution: workspace dependencies: async: ^2.9.0 path: ^1.8.2 stream_channel: ^2.1.0 dev_dependencies: - dart_flutter_team_lints: ^3.0.0 other_package: path: other_package/ test: any -dependency_overrides: - test: - path: ../../pkgs/test - test_api: - path: ../../pkgs/test_api - test_core: - path: ../../pkgs/test_core diff --git a/integration_tests/wasm/pubspec.yaml b/integration_tests/wasm/pubspec.yaml index 2cd0db156..b3024c7cc 100644 --- a/integration_tests/wasm/pubspec.yaml +++ b/integration_tests/wasm/pubspec.yaml @@ -1,14 +1,7 @@ name: wasm_tests publish_to: none environment: - sdk: ^3.4.0 + sdk: ^3.5.0-259.0.dev +resolution: workspace dev_dependencies: - dart_flutter_team_lints: ^3.0.0 test: any -dependency_overrides: - test: - path: ../../pkgs/test - test_api: - path: ../../pkgs/test_api - test_core: - path: ../../pkgs/test_core diff --git a/pkgs/checks/pubspec.yaml b/pkgs/checks/pubspec.yaml index 7a3eb3744..3850ebd4f 100644 --- a/pkgs/checks/pubspec.yaml +++ b/pkgs/checks/pubspec.yaml @@ -1,12 +1,12 @@ name: checks -version: 0.3.1-wip description: >- A framework for checking values against expectations and building custom expectations. repository: https://github.com/dart-lang/test/tree/master/pkgs/checks +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-259.0.dev dependencies: async: ^2.8.0 @@ -14,5 +14,4 @@ dependencies: test_api: ">=0.5.0 <0.8.0" dev_dependencies: - dart_flutter_team_lints: ^3.0.0 test: ^1.21.3 diff --git a/pkgs/checks/pubspec_overrides.yaml b/pkgs/checks/pubspec_overrides.yaml deleted file mode 100644 index 7d9aba4d4..000000000 --- a/pkgs/checks/pubspec_overrides.yaml +++ /dev/null @@ -1,7 +0,0 @@ -dependency_overrides: - test_api: - path: ../test_api - test_core: - path: ../test_core - test: - path: ../test diff --git a/pkgs/test/pubspec.yaml b/pkgs/test/pubspec.yaml index e4d425bfc..9831f364a 100644 --- a/pkgs/test/pubspec.yaml +++ b/pkgs/test/pubspec.yaml @@ -3,9 +3,10 @@ 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 +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-259.0.dev dependencies: analyzer: '>=5.12.0 <7.0.0' @@ -34,8 +35,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.3 - test_core: 0.6.5 + test_api: '>=0.7.3-wip <0.7.4' + test_core: '>=0.6.5-wip <0.6.6' typed_data: ^1.3.0 web_socket_channel: '>=2.0.0 <4.0.0' @@ -43,7 +44,6 @@ dependencies: yaml: ^3.0.0 dev_dependencies: - dart_flutter_team_lints: ^3.0.0 fake_async: ^1.0.0 glob: ^2.0.0 test_descriptor: ^2.0.0 diff --git a/pkgs/test/pubspec_overrides.yaml b/pkgs/test/pubspec_overrides.yaml deleted file mode 100644 index d02d71dea..000000000 --- a/pkgs/test/pubspec_overrides.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependency_overrides: - test_core: - path: ../test_core - test_api: - path: ../test_api diff --git a/pkgs/test_api/pubspec.yaml b/pkgs/test_api/pubspec.yaml index de874a5ba..1013deaff 100644 --- a/pkgs/test_api/pubspec.yaml +++ b/pkgs/test_api/pubspec.yaml @@ -3,9 +3,10 @@ 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 +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-259.0.dev dependencies: async: ^2.5.0 @@ -20,7 +21,6 @@ dependencies: dev_dependencies: analyzer: '>=2.1.0 <7.0.0' - dart_flutter_team_lints: ^3.0.0 fake_async: ^1.2.0 glob: ^2.0.0 graphs: ^2.0.0 diff --git a/pkgs/test_api/pubspec_overrides.yaml b/pkgs/test_api/pubspec_overrides.yaml deleted file mode 100644 index 15d993e48..000000000 --- a/pkgs/test_api/pubspec_overrides.yaml +++ /dev/null @@ -1,6 +0,0 @@ -dependency_overrides: - test: - path: ../test - test_core: - path: ../test_core - matcher: 0.12.16 diff --git a/pkgs/test_core/pubspec.yaml b/pkgs/test_core/pubspec.yaml index 71bebd27a..7f60471c6 100644 --- a/pkgs/test_core/pubspec.yaml +++ b/pkgs/test_core/pubspec.yaml @@ -2,9 +2,10 @@ name: test_core 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 +resolution: workspace environment: - sdk: ^3.4.0 + sdk: ^3.5.0-259.0.dev dependencies: analyzer: '>=3.3.0 <7.0.0' @@ -26,10 +27,9 @@ 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.3 + test_api: '>=0.7.3-wip <0.7.4' vm_service: ">=6.0.0 <15.0.0" yaml: ^3.0.0 dev_dependencies: - dart_flutter_team_lints: ^3.0.0 test: any diff --git a/pkgs/test_core/pubspec_overrides.yaml b/pkgs/test_core/pubspec_overrides.yaml deleted file mode 100644 index a265a692e..000000000 --- a/pkgs/test_core/pubspec_overrides.yaml +++ /dev/null @@ -1,5 +0,0 @@ -dependency_overrides: - test_api: - path: ../test_api - test: - path: ../test diff --git a/pubspec.yaml b/pubspec.yaml new file mode 100644 index 000000000..3bb4f67fa --- /dev/null +++ b/pubspec.yaml @@ -0,0 +1,14 @@ +name: test_workspace +publish_to: none +environment: + sdk: ^3.5.0-259.0.dev # Must be ^3.5.0 or later for workspace to be allowed +workspace: + - integration_tests/regression + - integration_tests/spawn_hybrid + - integration_tests/wasm + - pkgs/checks + - pkgs/test + - pkgs/test_api + - pkgs/test_core +dev_dependencies: + dart_flutter_team_lints: ^3.1.0 From 127022987a325aa6a0b1ddaebad186764a917057 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 2 Jul 2024 20:52:57 +0000 Subject: [PATCH 2/5] rerun mono_repo generate --- .github/workflows/dart.yml | 154 ++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index bfd415cdb..91426e1fa 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -40,23 +40,23 @@ jobs: - name: mono_repo self validate run: dart pub global run mono_repo generate --validate job_002: - 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`" + name: "analyze_and_format; linux; Dart 3.5.0-259.0.dev; PKGS: integration_tests/regression, integration_tests/wasm; `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 with: path: "~/.pub-cache/hosted" - key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/regression-integration_tests/wasm;commands:format-analyze_0" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:integration_tests/regression-integration_tests/wasm;commands:format-analyze_0" restore-keys: | - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0;packages:integration_tests/regression-integration_tests/wasm - os:ubuntu-latest;pub-cache-hosted;sdk:3.4.0 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:integration_tests/regression-integration_tests/wasm + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -87,23 +87,23 @@ jobs: if: "always() && steps.integration_tests_wasm_pub_upgrade.conclusion == 'success'" working-directory: integration_tests/wasm job_003: - name: "analyze_and_format; linux; Dart 3.4.0; PKGS: pkgs/checks, pkgs/test_core; `dart analyze`" + name: "analyze_and_format; linux; Dart 3.5.0-259.0.dev; 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/checks-pkgs/test_core;commands:analyze_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:pkgs/checks-pkgs/test_core;commands:analyze_1" restore-keys: | - 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;sdk:3.5.0-259.0.dev;packages:pkgs/checks-pkgs/test_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -238,23 +238,23 @@ jobs: if: "always() && steps.pkgs_test_core_pub_upgrade.conclusion == 'success'" working-directory: pkgs/test_core job_005: - name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/regression; `dart test`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; 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.4.0;packages:integration_tests/regression;commands:command_01" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:integration_tests/regression;commands:command_01" 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 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:integration_tests/regression + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -273,23 +273,23 @@ jobs: - job_003 - job_004 job_006: - name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/checks; `dart test`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; 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.4.0;packages:pkgs/checks;commands:command_01" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:pkgs/checks;commands:command_01" restore-keys: | - 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;sdk:3.5.0-259.0.dev;packages:pkgs/checks + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -308,23 +308,23 @@ jobs: - job_003 - job_004 job_007: - name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test_core; `dart test`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; PKG: pkgs/test_core; `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.4.0;packages:pkgs/test_core;commands:command_01" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:pkgs/test_core;commands:command_01" 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;sdk:3.5.0-259.0.dev;packages:pkgs/test_core + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -343,23 +343,23 @@ jobs: - job_003 - job_004 job_008: - name: "unit_test; linux; Dart 3.4.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; 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/spawn_hybrid;commands:test_1" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:integration_tests/spawn_hybrid;commands:test_1" restore-keys: | - 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;sdk:3.5.0-259.0.dev;packages:integration_tests/spawn_hybrid + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -378,23 +378,23 @@ jobs: - job_003 - job_004 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`" + name: "unit_test; linux; Dart 3.5.0-259.0.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: - 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.5.0-259.0.dev;packages:integration_tests/wasm;commands:command_00-test_2" 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 + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:integration_tests/wasm + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -417,23 +417,23 @@ jobs: - job_003 - job_004 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`" + name: "unit_test; linux; Dart 3.5.0-259.0.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: - 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;commands:command_02" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:pkgs/test;commands:command_02" restore-keys: | - 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;sdk:3.5.0-259.0.dev;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -452,23 +452,23 @@ jobs: - job_003 - job_004 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`" + name: "unit_test; linux; Dart 3.5.0-259.0.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: - 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;commands:command_03" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:pkgs/test;commands:command_03" restore-keys: | - 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;sdk:3.5.0-259.0.dev;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -487,23 +487,23 @@ jobs: - job_003 - job_004 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`" + name: "unit_test; linux; Dart 3.5.0-259.0.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: - 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;commands:command_04" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:pkgs/test;commands:command_04" restore-keys: | - 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;sdk:3.5.0-259.0.dev;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -522,23 +522,23 @@ jobs: - job_003 - job_004 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`" + name: "unit_test; linux; Dart 3.5.0-259.0.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: - 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;commands:command_05" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:pkgs/test;commands:command_05" restore-keys: | - 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;sdk:3.5.0-259.0.dev;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -557,23 +557,23 @@ jobs: - job_003 - job_004 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`" + name: "unit_test; linux; Dart 3.5.0-259.0.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: - 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;commands:command_06" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;packages:pkgs/test;commands:command_06" restore-keys: | - 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;sdk:3.5.0-259.0.dev;packages:pkgs/test + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -592,23 +592,23 @@ jobs: - job_003 - job_004 job_015: - name: "unit_test; linux; Dart 3.4.0; PKG: pkgs/test_api; `dart test --preset travis -x browser`" + name: "unit_test; linux; Dart 3.5.0-259.0.dev; 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" + key: "os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev;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;sdk:3.5.0-259.0.dev;packages:pkgs/test_api + os:ubuntu-latest;pub-cache-hosted;sdk:3.5.0-259.0.dev os:ubuntu-latest;pub-cache-hosted os:ubuntu-latest - name: Setup Dart SDK uses: dart-lang/setup-dart@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -1016,13 +1016,13 @@ jobs: - job_003 - job_004 job_027: - name: "unit_test; windows; Dart 3.4.0; PKG: integration_tests/spawn_hybrid; `dart test -p chrome,vm,node`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; 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@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -1041,13 +1041,13 @@ jobs: - job_003 - job_004 job_028: - name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 0`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; 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@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -1066,13 +1066,13 @@ jobs: - job_003 - job_004 job_029: - name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 1`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; 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@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -1091,13 +1091,13 @@ jobs: - job_003 - job_004 job_030: - name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 2`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; 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@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -1116,13 +1116,13 @@ jobs: - job_003 - job_004 job_031: - name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 3`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; 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@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 @@ -1141,13 +1141,13 @@ jobs: - job_003 - job_004 job_032: - name: "unit_test; windows; Dart 3.4.0; PKG: pkgs/test; `dart test --preset travis --total-shards 5 --shard-index 4`" + name: "unit_test; windows; Dart 3.5.0-259.0.dev; 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@0a8a0fc875eb934c15d08629302413c671d3f672 with: - sdk: "3.4.0" + sdk: "3.5.0-259.0.dev" - id: checkout name: Checkout repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 From 063bedcb7f18057ee10a43a842baeb85e860edae Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 2 Jul 2024 21:13:09 +0000 Subject: [PATCH 3/5] fix accidental deletion of version in package:checks pubspec --- pkgs/checks/pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/checks/pubspec.yaml b/pkgs/checks/pubspec.yaml index 3850ebd4f..c1b031db7 100644 --- a/pkgs/checks/pubspec.yaml +++ b/pkgs/checks/pubspec.yaml @@ -1,4 +1,5 @@ name: checks +version: 0.3.1-wip description: >- A framework for checking values against expectations and building custom expectations. From 3834c5313f42dbc8644f9e73f7000f14ee829ece Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Tue, 2 Jul 2024 21:20:02 +0000 Subject: [PATCH 4/5] pin exactly the wip versions --- pkgs/test/pubspec.yaml | 4 ++-- pkgs/test_core/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/test/pubspec.yaml b/pkgs/test/pubspec.yaml index 9831f364a..22b6c4bee 100644 --- a/pkgs/test/pubspec.yaml +++ b/pkgs/test/pubspec.yaml @@ -35,8 +35,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.3-wip <0.7.4' - test_core: '>=0.6.5-wip <0.6.6' + test_api: 0.7.3-wip + test_core: 0.6.5-wip typed_data: ^1.3.0 web_socket_channel: '>=2.0.0 <4.0.0' diff --git a/pkgs/test_core/pubspec.yaml b/pkgs/test_core/pubspec.yaml index 7f60471c6..dc57f2f67 100644 --- a/pkgs/test_core/pubspec.yaml +++ b/pkgs/test_core/pubspec.yaml @@ -27,7 +27,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.3-wip <0.7.4' + test_api: 0.7.3-wip vm_service: ">=6.0.0 <15.0.0" yaml: ^3.0.0 From b0ee0cb0b11c1c774e2d2a52fdd5991f777af026 Mon Sep 17 00:00:00 2001 From: Jake Macdonald Date: Mon, 8 Jul 2024 16:22:04 +0000 Subject: [PATCH 5/5] update versions --- pkgs/test/CHANGELOG.md | 4 ++++ pkgs/test/pubspec.yaml | 6 +++--- pkgs/test_api/CHANGELOG.md | 4 ++++ pkgs/test_api/pubspec.yaml | 2 +- pkgs/test_core/CHANGELOG.md | 4 ++++ pkgs/test_core/pubspec.yaml | 4 ++-- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/test/CHANGELOG.md b/pkgs/test/CHANGELOG.md index c015acc3b..60100aa8b 100644 --- a/pkgs/test/CHANGELOG.md +++ b/pkgs/test/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.25.9-wip + +* Increase SDK constraint to ^3.5.0-259.0.dev. + ## 1.25.8 * Increase SDK constraint to ^3.4.0. diff --git a/pkgs/test/pubspec.yaml b/pkgs/test/pubspec.yaml index 46523e9d6..73b746e23 100644 --- a/pkgs/test/pubspec.yaml +++ b/pkgs/test/pubspec.yaml @@ -1,5 +1,5 @@ name: test -version: 1.25.8 +version: 1.25.9-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 @@ -35,8 +35,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.3-wip - test_core: 0.6.5-wip + test_api: 0.7.4-wip + test_core: 0.6.6-wip 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 dda8bd9f4..cb9a01226 100644 --- a/pkgs/test_api/CHANGELOG.md +++ b/pkgs/test_api/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.7.4-wip + +* Increase SDK constraint to ^3.5.0-259.0.dev. + ## 0.7.3 * Increase SDK constraint to ^3.4.0. diff --git a/pkgs/test_api/pubspec.yaml b/pkgs/test_api/pubspec.yaml index 1dac11b6b..c34f9fc3b 100644 --- a/pkgs/test_api/pubspec.yaml +++ b/pkgs/test_api/pubspec.yaml @@ -1,5 +1,5 @@ name: test_api -version: 0.7.3 +version: 0.7.4-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 diff --git a/pkgs/test_core/CHANGELOG.md b/pkgs/test_core/CHANGELOG.md index 5240f481a..fd88f3329 100644 --- a/pkgs/test_core/CHANGELOG.md +++ b/pkgs/test_core/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.6-wip + +* Increase SDK constraint to ^3.5.0-259.0.dev. + ## 0.6.5 * Increase SDK constraint to ^3.4.0. diff --git a/pkgs/test_core/pubspec.yaml b/pkgs/test_core/pubspec.yaml index 85b18bee6..8bdc66b4f 100644 --- a/pkgs/test_core/pubspec.yaml +++ b/pkgs/test_core/pubspec.yaml @@ -1,5 +1,5 @@ name: test_core -version: 0.6.5 +version: 0.6.6-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 resolution: workspace @@ -27,7 +27,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.3-wip + test_api: 0.7.4-wip vm_service: ">=6.0.0 <15.0.0" yaml: ^3.0.0