Skip to content

Commit c0d6116

Browse files
Pauliusd01Pauliusd01
committed
Merge branch 'develop' into release/1.X
2 parents 672e42c + f3ea709 commit c0d6116

File tree

72 files changed

+410
-1455
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+410
-1455
lines changed

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

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -110,61 +110,6 @@ inputsystem-editorfunctionaltests_-_6000_0_-_windows:
110110
paths:
111111
- artifacts/**/*
112112

113-
# InputSystem-EditorFunctionalTests - 6000.2 - MacOS
114-
inputsystem-editorfunctionaltests_-_6000_2_-_macos:
115-
name: InputSystem-EditorFunctionalTests - 6000.2 - MacOS
116-
agent:
117-
image: package-ci/macos-13:default
118-
type: Unity::VM::osx
119-
flavor: b1.xlarge
120-
commands:
121-
- 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
122-
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait
123-
- 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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_MacOS_6000.2_project;flags:inputsystem_MacOS_6000.2_project" --timeout=3600 --artifacts-path=artifacts
124-
after:
125-
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
126-
artifacts:
127-
artifacts:
128-
paths:
129-
- artifacts/**/*
130-
131-
# InputSystem-EditorFunctionalTests - 6000.2 - Ubuntu
132-
inputsystem-editorfunctionaltests_-_6000_2_-_ubuntu:
133-
name: InputSystem-EditorFunctionalTests - 6000.2 - Ubuntu
134-
agent:
135-
image: package-ci/ubuntu-22.04:default
136-
type: Unity::VM
137-
flavor: b1.large
138-
commands:
139-
- 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
140-
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait
141-
- 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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:$YAMATO_SOURCE_DIR/Packages;" --coverage-results-path=$YAMATO_SOURCE_DIR/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Ubuntu_6000.2_project;flags:inputsystem_Ubuntu_6000.2_project" --timeout=3600 --artifacts-path=artifacts
142-
after:
143-
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
144-
artifacts:
145-
artifacts:
146-
paths:
147-
- artifacts/**/*
148-
149-
# InputSystem-EditorFunctionalTests - 6000.2 - Windows
150-
inputsystem-editorfunctionaltests_-_6000_2_-_windows:
151-
name: InputSystem-EditorFunctionalTests - 6000.2 - Windows
152-
agent:
153-
image: package-ci/win10:default
154-
type: Unity::VM
155-
flavor: b1.large
156-
commands:
157-
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
158-
- 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
159-
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait
160-
- 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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem*;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:%YAMATO_SOURCE_DIR%/Packages;" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/CodeCoverage --coverage-upload-options="reportsDir:upm-ci~/CodeCoverage;name:inputsystem_Windows_6000.2_project;flags:inputsystem_Windows_6000.2_project" --timeout=3600 --artifacts-path=artifacts
161-
after:
162-
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
163-
artifacts:
164-
artifacts:
165-
paths:
166-
- artifacts/**/*
167-
168113
# InputSystem-EditorFunctionalTests - 6000.3 - MacOS
169114
inputsystem-editorfunctionaltests_-_6000_3_-_macos:
170115
name: InputSystem-EditorFunctionalTests - 6000.3 - MacOS

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

Lines changed: 0 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -110,61 +110,6 @@ inputsystem-editorperformancetests_-_6000_0_-_windows:
110110
paths:
111111
- artifacts/**/*
112112

113-
# InputSystem-EditorPerformanceTests - 6000.2 - MacOS
114-
inputsystem-editorperformancetests_-_6000_2_-_macos:
115-
name: InputSystem-EditorPerformanceTests - 6000.2 - MacOS
116-
agent:
117-
image: package-ci/macos-13:default
118-
type: Unity::VM::osx
119-
flavor: b1.xlarge
120-
commands:
121-
- 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
122-
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait
123-
- 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
124-
after:
125-
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
126-
artifacts:
127-
artifacts:
128-
paths:
129-
- artifacts/**/*
130-
131-
# InputSystem-EditorPerformanceTests - 6000.2 - Ubuntu
132-
inputsystem-editorperformancetests_-_6000_2_-_ubuntu:
133-
name: InputSystem-EditorPerformanceTests - 6000.2 - Ubuntu
134-
agent:
135-
image: package-ci/ubuntu-22.04:default
136-
type: Unity::VM
137-
flavor: b1.large
138-
commands:
139-
- 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
140-
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait
141-
- 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
142-
after:
143-
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
144-
artifacts:
145-
artifacts:
146-
paths:
147-
- artifacts/**/*
148-
149-
# InputSystem-EditorPerformanceTests - 6000.2 - Windows
150-
inputsystem-editorperformancetests_-_6000_2_-_windows:
151-
name: InputSystem-EditorPerformanceTests - 6000.2 - Windows
152-
agent:
153-
image: package-ci/win10:default
154-
type: Unity::VM
155-
flavor: b1.large
156-
commands:
157-
- command: '%GSUDO% choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes'
158-
- 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
159-
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast --wait
160-
- 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
161-
after:
162-
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
163-
artifacts:
164-
artifacts:
165-
paths:
166-
- artifacts/**/*
167-
168113
# InputSystem-EditorPerformanceTests - 6000.3 - MacOS
169114
inputsystem-editorperformancetests_-_6000_3_-_macos:
170115
name: InputSystem-EditorPerformanceTests - 6000.3 - MacOS

‎.yamato/input-system-mobile-functional-build-jobs.yml‎

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -178,95 +178,6 @@ inputsystem-mobilefunctionalbuildjobs_-_6000_0_-_tvos:
178178
paths:
179179
- build/players/**/*
180180

181-
# InputSystem-MobileFunctionalBuildJobs - 6000.2 - Android - il2cpp
182-
inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_il2cpp:
183-
name: InputSystem-MobileFunctionalBuildJobs - 6000.2 - Android - il2cpp
184-
agent:
185-
image: package-ci/win10:default
186-
type: Unity::VM
187-
flavor: b1.xlarge
188-
commands:
189-
- command: unity-downloader-cli -u 6000.2/staging -c Editor -c Android --fast --wait
190-
- command: |-
191-
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
192-
UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android --scripting-backend=il2cpp
193-
after:
194-
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
195-
artifacts:
196-
logs:
197-
paths:
198-
- build/logs/**/*
199-
players:
200-
paths:
201-
- build/players/**/*
202-
203-
# InputSystem-MobileFunctionalBuildJobs - 6000.2 - Android - mono
204-
inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_android_-_mono:
205-
name: InputSystem-MobileFunctionalBuildJobs - 6000.2 - Android - mono
206-
agent:
207-
image: package-ci/win10:default
208-
type: Unity::VM
209-
flavor: b1.xlarge
210-
commands:
211-
- command: unity-downloader-cli -u 6000.2/staging -c Editor -c Android --fast --wait
212-
- command: |-
213-
set ANDROID_DEVICE_CONNECTION=%BOKKEN_DEVICE_IP%
214-
UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=android
215-
after:
216-
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
217-
artifacts:
218-
logs:
219-
paths:
220-
- build/logs/**/*
221-
players:
222-
paths:
223-
- build/players/**/*
224-
225-
# InputSystem-MobileFunctionalBuildJobs - 6000.2 - IOS
226-
inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_ios:
227-
name: InputSystem-MobileFunctionalBuildJobs - 6000.2 - IOS
228-
agent:
229-
image: package-ci/macos-13:default
230-
type: Unity::VM::osx
231-
flavor: m1.mac
232-
commands:
233-
- command: unity-downloader-cli -u 6000.2/staging -c Editor -c iOS --fast --wait
234-
- command: |-
235-
curl -s https://artifactory-slo.bf.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
236-
chmod u+x utr
237-
- command: ./utr --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=ios
238-
after:
239-
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
240-
artifacts:
241-
logs:
242-
paths:
243-
- build/logs/**/*
244-
players:
245-
paths:
246-
- build/players/**/*
247-
variables:
248-
UTR_VERSION: 1.42.0
249-
250-
# InputSystem-MobileFunctionalBuildJobs - 6000.2 - TvOS
251-
inputsystem-mobilefunctionalbuildjobs_-_6000_2_-_tvos:
252-
name: InputSystem-MobileFunctionalBuildJobs - 6000.2 - TvOS
253-
agent:
254-
image: package-ci/macos-13:default
255-
type: Unity::VM::osx
256-
flavor: m1.mac
257-
commands:
258-
- command: unity-downloader-cli -u 6000.2/staging -c Editor -c AppleTV --fast --wait
259-
- command: UnifiedTestRunner --testproject=. --editor-location=.Editor --suite=playmode --category=!Performance --clean-library --reruncount=1 --clean-library-on-rerun --build-only --player-save-path=build/players --timeout=3600 --artifacts-path=build/logs --platform=tvOS
260-
after:
261-
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
262-
artifacts:
263-
logs:
264-
paths:
265-
- build/logs/**/*
266-
players:
267-
paths:
268-
- build/players/**/*
269-
270181
# InputSystem-MobileFunctionalBuildJobs - 6000.3 - Android - il2cpp
271182
inputsystem-mobilefunctionalbuildjobs_-_6000_3_-_android_-_il2cpp:
272183
name: InputSystem-MobileFunctionalBuildJobs - 6000.3 - Android - il2cpp

0 commit comments

Comments
 (0)