Skip to content

Commit

Permalink
[ci] Finalize migration to x64 specific Windows platform (#5174)
Browse files Browse the repository at this point in the history
#5133 began to migrate the Windows CI tests to use a new x64 specific Windows platform. This completes the migration by removing the old Windows tests and removing `bringup` from the new x64 specific tests.

To see the resulting changes from both steps of the migration, refer to: 0bddb16...loic-sharma:flutter-packages:windows_x64_ci_finalize_2#diff-9e73abde9fff445f31e5928e80d2d3f88847e02fd8f76d46f66f147fdc82786d

Prepares for flutter/flutter#129813

Previous stacked pull request: #5133
Next stacked pull request: #5142
  • Loading branch information
loic-sharma committed Oct 20, 2023
1 parent 353e9a2 commit be915be
Showing 1 changed file with 0 additions and 140 deletions.
140 changes: 0 additions & 140 deletions .ci.yaml
Expand Up @@ -62,14 +62,6 @@ platform_properties:
[
{"dependency": "chrome_and_driver", "version": "version:114.0"}
]
windows:
properties:
dependencies: >
[
{"dependency": "certs", "version": "version:9563bb"}
]
device_type: none
os: Windows
windows_x64:
properties:
dependencies: >
Expand Down Expand Up @@ -973,23 +965,9 @@ targets:
package_sharding: "--shardIndex 4 --shardCount 5"

### Windows desktop tasks ###
- name: Windows custom_package_tests master - packages
recipe: packages/packages
timeout: 60
properties:
add_recipes_cq: "true"
target_file: windows_custom_package_tests.yaml
channel: master
version_file: flutter_master.version
dependencies: >
[
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows_x64 custom_package_tests master - packages
recipe: packages/packages
timeout: 60
bringup: true
properties:
add_recipes_cq: "true"
target_file: windows_custom_package_tests.yaml
Expand All @@ -1000,62 +978,27 @@ targets:
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows dart_unit_tests_shard_1 master
recipe: packages/packages
timeout: 60
properties:
target_file: windows_dart_unit_tests.yaml
channel: master
version_file: flutter_master.version
package_sharding: "--shardIndex 0 --shardCount 2"

- name: Windows_x64 dart_unit_tests_shard_1 master
recipe: packages/packages
timeout: 60
bringup: true
properties:
target_file: windows_dart_unit_tests.yaml
channel: master
version_file: flutter_master.version
package_sharding: "--shardIndex 0 --shardCount 2"

- name: Windows dart_unit_tests_shard_2 master
recipe: packages/packages
timeout: 60
properties:
target_file: windows_dart_unit_tests.yaml
channel: master
version_file: flutter_master.version
package_sharding: "--shardIndex 1 --shardCount 2"

- name: Windows_x64 dart_unit_tests_shard_2 master
recipe: packages/packages
timeout: 60
bringup: true
properties:
target_file: windows_dart_unit_tests.yaml
channel: master
version_file: flutter_master.version
package_sharding: "--shardIndex 1 --shardCount 2"

- name: Windows win32-platform_tests_shard_1 master
recipe: packages/packages
timeout: 60
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
channel: master
version_file: flutter_master.version
package_sharding: "--shardIndex 0 --shardCount 2"
dependencies: >
[
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows_x64 win32-platform_tests_shard_1 master
recipe: packages/packages
timeout: 60
bringup: true
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
Expand All @@ -1067,24 +1010,9 @@ targets:
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows win32-platform_tests_shard_2 master
recipe: packages/packages
timeout: 60
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
channel: master
version_file: flutter_master.version
package_sharding: "--shardIndex 1 --shardCount 2"
dependencies: >
[
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows_x64 win32-platform_tests_shard_2 master
recipe: packages/packages
timeout: 60
bringup: true
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
Expand All @@ -1096,24 +1024,9 @@ targets:
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows win32-platform_tests_shard_1 stable
recipe: packages/packages
timeout: 60
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
channel: stable
version_file: flutter_stable.version
package_sharding: "--shardIndex 0 --shardCount 2"
dependencies: >
[
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows_x64 win32-platform_tests_shard_1 stable
recipe: packages/packages
timeout: 60
bringup: true
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
Expand All @@ -1125,24 +1038,9 @@ targets:
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows win32-platform_tests_shard_2 stable
recipe: packages/packages
timeout: 60
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
channel: stable
version_file: flutter_stable.version
package_sharding: "--shardIndex 1 --shardCount 2"
dependencies: >
[
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows_x64 win32-platform_tests_shard_2 stable
recipe: packages/packages
timeout: 60
bringup: true
properties:
add_recipes_cq: "true"
target_file: windows_build_and_platform_tests.yaml
Expand All @@ -1154,23 +1052,9 @@ targets:
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows windows-build_all_packages master
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
target_file: windows_build_all_packages.yaml
channel: master
version_file: flutter_master.version
dependencies: >
[
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows_x64 windows-build_all_packages master
recipe: packages/packages
timeout: 30
bringup: true
properties:
add_recipes_cq: "true"
target_file: windows_build_all_packages.yaml
Expand All @@ -1181,23 +1065,9 @@ targets:
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows windows-build_all_packages stable
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
target_file: windows_build_all_packages.yaml
channel: stable
version_file: flutter_stable.version
dependencies: >
[
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows_x64 windows-build_all_packages stable
recipe: packages/packages
timeout: 30
bringup: true
properties:
add_recipes_cq: "true"
target_file: windows_build_all_packages.yaml
Expand All @@ -1208,19 +1078,9 @@ targets:
{"dependency": "vs_build", "version": "version:vs2019"}
]
- name: Windows repo_tools_tests
recipe: packages/packages
timeout: 30
properties:
add_recipes_cq: "true"
target_file: repo_tools_tests.yaml
channel: master
version_file: flutter_master.version

- name: Windows_x64 repo_tools_tests
recipe: packages/packages
timeout: 30
bringup: true
properties:
add_recipes_cq: "true"
target_file: repo_tools_tests.yaml
Expand Down

0 comments on commit be915be

Please sign in to comment.