Skip to content

Commit 025fd1a

Browse files
Pauliusd01Pauliusd01
authored
FIX: Restore CI compilation broken by stale Wrench 1.x platform override (#2450)
1 parent 6b99df4 commit 025fd1a

15 files changed

Lines changed: 792 additions & 582 deletions

‎.yamato/input-system-editor-functional-tests.yml‎

Lines changed: 63 additions & 44 deletions
Large diffs are not rendered by default.

‎.yamato/input-system-editor-performance-tests.yml‎

Lines changed: 54 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -115,16 +115,16 @@ inputsystem-editorperformancetests_-_6000_3_-_win10:
115115
paths:
116116
- artifacts/**/*
117117

118-
# InputSystem-EditorPerformanceTests - 6000.4 - MacOs13
119-
inputsystem-editorperformancetests_-_6000_4_-_macos13:
120-
name: InputSystem-EditorPerformanceTests - 6000.4 - MacOs13
118+
# InputSystem-EditorPerformanceTests - 6000.5 - MacOs13
119+
inputsystem-editorperformancetests_-_6000_5_-_macos13:
120+
name: InputSystem-EditorPerformanceTests - 6000.5 - MacOs13
121121
agent:
122122
image: package-ci/macos-13:v4
123123
type: Unity::VM::osx
124124
flavor: b1.xlarge
125125
commands:
126126
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
127-
- command: unity-downloader-cli -u 6000.4/staging -c Editor --fast --wait
127+
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
128128
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
129129
after:
130130
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -133,16 +133,16 @@ inputsystem-editorperformancetests_-_6000_4_-_macos13:
133133
paths:
134134
- artifacts/**/*
135135

136-
# InputSystem-EditorPerformanceTests - 6000.4 - Ubuntu2204
137-
inputsystem-editorperformancetests_-_6000_4_-_ubuntu2204:
138-
name: InputSystem-EditorPerformanceTests - 6000.4 - Ubuntu2204
136+
# InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu2204
137+
inputsystem-editorperformancetests_-_6000_5_-_ubuntu2204:
138+
name: InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu2204
139139
agent:
140140
image: package-ci/ubuntu-22.04:v4
141141
type: Unity::VM::GPU
142142
flavor: b1.large
143143
commands:
144144
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
145-
- command: unity-downloader-cli -u 6000.4/staging -c Editor --fast --wait
145+
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
146146
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
147147
after:
148148
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -151,17 +151,17 @@ inputsystem-editorperformancetests_-_6000_4_-_ubuntu2204:
151151
paths:
152152
- artifacts/**/*
153153

154-
# InputSystem-EditorPerformanceTests - 6000.4 - Win10
155-
inputsystem-editorperformancetests_-_6000_4_-_win10:
156-
name: InputSystem-EditorPerformanceTests - 6000.4 - Win10
154+
# InputSystem-EditorPerformanceTests - 6000.5 - Win10
155+
inputsystem-editorperformancetests_-_6000_5_-_win10:
156+
name: InputSystem-EditorPerformanceTests - 6000.5 - Win10
157157
agent:
158158
image: package-ci/win10:v4
159159
type: Unity::VM
160160
flavor: b1.large
161161
commands:
162162
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
163163
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
164-
- command: unity-downloader-cli -u 6000.4/staging -c Editor --fast --wait
164+
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
165165
- command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
166166
after:
167167
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
@@ -170,16 +170,17 @@ inputsystem-editorperformancetests_-_6000_4_-_win10:
170170
paths:
171171
- artifacts/**/*
172172

173-
# InputSystem-EditorPerformanceTests - 6000.5 - MacOs13
174-
inputsystem-editorperformancetests_-_6000_5_-_macos13:
175-
name: InputSystem-EditorPerformanceTests - 6000.5 - MacOs13
173+
# InputSystem-EditorPerformanceTests - 6000.6 - MacOs13Arm
174+
inputsystem-editorperformancetests_-_6000_6_-_macos13arm:
175+
name: InputSystem-EditorPerformanceTests - 6000.6 - MacOs13Arm
176176
agent:
177-
image: package-ci/macos-13:v4
177+
image: package-ci/macos-13-arm64:v4
178178
type: Unity::VM::osx
179-
flavor: b1.xlarge
179+
flavor: m1.mac
180+
model: M1
180181
commands:
181182
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
182-
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
183+
- command: unity-downloader-cli -u 6000.6/staging -c Editor --fast --wait
183184
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
184185
after:
185186
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
@@ -188,16 +189,16 @@ inputsystem-editorperformancetests_-_6000_5_-_macos13:
188189
paths:
189190
- artifacts/**/*
190191

191-
# InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu2204
192-
inputsystem-editorperformancetests_-_6000_5_-_ubuntu2204:
193-
name: InputSystem-EditorPerformanceTests - 6000.5 - Ubuntu2204
192+
# InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu2204
193+
inputsystem-editorperformancetests_-_6000_6_-_ubuntu2204:
194+
name: InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu2204
194195
agent:
195196
image: package-ci/ubuntu-22.04:v4
196197
type: Unity::VM::GPU
197198
flavor: b1.large
198199
commands:
199200
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
200-
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
201+
- command: unity-downloader-cli -u 6000.6/staging -c Editor --fast --wait
201202
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
202203
after:
203204
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
@@ -206,17 +207,17 @@ inputsystem-editorperformancetests_-_6000_5_-_ubuntu2204:
206207
paths:
207208
- artifacts/**/*
208209

209-
# InputSystem-EditorPerformanceTests - 6000.5 - Win10
210-
inputsystem-editorperformancetests_-_6000_5_-_win10:
211-
name: InputSystem-EditorPerformanceTests - 6000.5 - Win10
210+
# InputSystem-EditorPerformanceTests - 6000.6 - Win10
211+
inputsystem-editorperformancetests_-_6000_6_-_win10:
212+
name: InputSystem-EditorPerformanceTests - 6000.6 - Win10
212213
agent:
213214
image: package-ci/win10:v4
214215
type: Unity::VM
215216
flavor: b1.large
216217
commands:
217218
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
218219
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
219-
- command: unity-downloader-cli -u 6000.5/staging -c Editor --fast --wait
220+
- command: unity-downloader-cli -u 6000.6/staging -c Editor --fast --wait
220221
- command: UnifiedTestRunner.exe --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
221222
after:
222223
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
@@ -225,9 +226,27 @@ inputsystem-editorperformancetests_-_6000_5_-_win10:
225226
paths:
226227
- artifacts/**/*
227228

228-
# InputSystem-EditorPerformanceTests - 6000.6 - MacOs13Arm
229-
inputsystem-editorperformancetests_-_6000_6_-_macos13arm:
230-
name: InputSystem-EditorPerformanceTests - 6000.6 - MacOs13Arm
229+
# InputSystem-EditorPerformanceTests - 6000.7 - MacOs13
230+
inputsystem-editorperformancetests_-_6000_7_-_macos13:
231+
name: InputSystem-EditorPerformanceTests - 6000.7 - MacOs13
232+
agent:
233+
image: package-ci/macos-13:v4
234+
type: Unity::VM::osx
235+
flavor: b1.xlarge
236+
commands:
237+
- command: git clone --branch "2.3.0-preview" git@github.cds.internal.unity3d.com:unity/com.unity.package-manager-doctools.git Packages/com.unity.package-manager-doctools
238+
- command: unity-downloader-cli -u trunk -c Editor --fast --wait
239+
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=Editor --suite=Playmode --category=Performance --clean-library --api-profile=NET_4_6 --reruncount=1 --clean-library-on-rerun --report-performance-data --performance-project-id=InputSystem --timeout=3600 --artifacts-path=artifacts
240+
after:
241+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
242+
artifacts:
243+
artifacts:
244+
paths:
245+
- artifacts/**/*
246+
247+
# InputSystem-EditorPerformanceTests - 6000.7 - MacOs13Arm
248+
inputsystem-editorperformancetests_-_6000_7_-_macos13arm:
249+
name: InputSystem-EditorPerformanceTests - 6000.7 - MacOs13Arm
231250
agent:
232251
image: package-ci/macos-13-arm64:v4
233252
type: Unity::VM::osx
@@ -244,9 +263,9 @@ inputsystem-editorperformancetests_-_6000_6_-_macos13arm:
244263
paths:
245264
- artifacts/**/*
246265

247-
# InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu2204
248-
inputsystem-editorperformancetests_-_6000_6_-_ubuntu2204:
249-
name: InputSystem-EditorPerformanceTests - 6000.6 - Ubuntu2204
266+
# InputSystem-EditorPerformanceTests - 6000.7 - Ubuntu2204
267+
inputsystem-editorperformancetests_-_6000_7_-_ubuntu2204:
268+
name: InputSystem-EditorPerformanceTests - 6000.7 - Ubuntu2204
250269
agent:
251270
image: package-ci/ubuntu-22.04:v4
252271
type: Unity::VM::GPU
@@ -262,9 +281,9 @@ inputsystem-editorperformancetests_-_6000_6_-_ubuntu2204:
262281
paths:
263282
- artifacts/**/*
264283

265-
# InputSystem-EditorPerformanceTests - 6000.6 - Win10
266-
inputsystem-editorperformancetests_-_6000_6_-_win10:
267-
name: InputSystem-EditorPerformanceTests - 6000.6 - Win10
284+
# InputSystem-EditorPerformanceTests - 6000.7 - Win10
285+
inputsystem-editorperformancetests_-_6000_7_-_win10:
286+
name: InputSystem-EditorPerformanceTests - 6000.7 - Win10
268287
agent:
269288
image: package-ci/win10:v4
270289
type: Unity::VM

0 commit comments

Comments
 (0)