比较提交

...
此合并请求有变更与目标分支冲突。
/.yamato/upm-ci-performance.yml
/.yamato/environments.yml
/.yamato/upm-ci-testprojects.yml
/TestProjects/PerceptionHDRP/Packages/manifest.json
/TestProjects/PerceptionHDRP/Packages/packages-lock.json
/TestProjects/PerceptionHDRP/ProjectSettings/PackageManagerSettings.asset
/TestProjects/PerceptionHDRP/ProjectSettings/ProjectSettings.asset
/TestProjects/PerceptionHDRP/ProjectSettings/ProjectVersion.txt

4 次代码提交

共有 9 个文件被更改,包括 36 次插入42 次删除
  1. 4
      TestProjects/PerceptionHDRP/Assets/Terrain Data.asset
  2. 7
      TestProjects/PerceptionHDRP/Packages/manifest.json
  3. 38
      TestProjects/PerceptionHDRP/Packages/packages-lock.json
  4. 4
      TestProjects/PerceptionHDRP/ProjectSettings/PackageManagerSettings.asset
  5. 2
      TestProjects/PerceptionHDRP/ProjectSettings/ProjectSettings.asset
  6. 4
      TestProjects/PerceptionHDRP/ProjectSettings/ProjectVersion.txt
  7. 10
      .yamato/environments.yml
  8. 6
      .yamato/upm-ci-performance.yml
  9. 3
      .yamato/upm-ci-testprojects.yml

4
TestProjects/PerceptionHDRP/Assets/Terrain Data.asset
文件差异内容过多而无法显示
查看文件

7
TestProjects/PerceptionHDRP/Packages/manifest.json


{
"dependencies": {
"com.unity.collab-proxy": "1.2.16",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ext.nunit": "1.0.5",
"com.unity.ide.vscode": "1.2.1",
"com.unity.ide.vscode": "1.2.3",
"com.unity.package-validation-suite": "0.9.1-preview",
"com.unity.perception": "file:../../../com.unity.perception",
"com.unity.render-pipelines.core": "7.3.1",

"com.unity.test-framework": "1.1.16",
"com.unity.test-framework": "1.1.19",
"com.unity.textmeshpro": "2.0.1",
"com.unity.ugui": "1.0.0",
"nuget.moq": "1.0.0",
"com.unity.modules.ai": "1.0.0",

38
TestProjects/PerceptionHDRP/Packages/packages-lock.json


{
"dependencies": {
"com.unity.burst": {
"version": "1.3.0-preview.5",
"depth": 2,
"version": "1.3.9",
"depth": 1,
"com.unity.mathematics": "1.1.0"
"com.unity.mathematics": "1.2.1"
},
"url": "https://packages.unity.com"
},

"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.0",
"version": "1.0.5",
"depth": 0,
"source": "registry",
"dependencies": {},

"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.1",
"version": "1.2.3",
"depth": 0,
"source": "registry",
"dependencies": {},

"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.1.0",
"version": "1.2.1",
"depth": 2,
"source": "registry",
"dependencies": {},

"dependencies": {
"com.unity.nuget.newtonsoft-json": "1.1.2",
"com.unity.render-pipelines.core": "7.1.6",
"com.unity.burst": "1.3.9",
"com.unity.simulation.capture": "0.0.10-preview.13",
"com.unity.simulation.core": "0.0.10-preview.19"
"com.unity.simulation.capture": "0.0.10-preview.14",
"com.unity.simulation.core": "0.0.10-preview.20"
}
},
"com.unity.platforms": {

"url": "https://packages.unity.com"
},
"com.unity.simulation.capture": {
"version": "0.0.10-preview.13",
"depth": 0,
"version": "0.0.10-preview.14",
"depth": 1,
"source": "registry",
"dependencies": {
"com.unity.simulation.core": "0.0.10-preview.19"

"url": "https://packages.unity.com"
},
"com.unity.simulation.core": {
"version": "0.0.10-preview.19",
"depth": 0,
"version": "0.0.10-preview.20",
"depth": 1,
"version": "1.1.16",
"version": "1.1.19",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ext.nunit": "1.0.5",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0"
},

"source": "registry",
"dependencies": {
"com.unity.test-framework": "1.0.16"
},
"url": "https://packages.unity.com"
},
"com.unity.textmeshpro": {
"version": "2.0.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},

4
TestProjects/PerceptionHDRP/ProjectSettings/PackageManagerSettings.asset


m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 0}
m_Script: {fileID: 13960, guid: 0000000000000000e000000000000000, type: 0}
m_EditorClassIdentifier: UnityEditor:UnityEditor.PackageManager.UI:PackageManagerProjectSettings
m_EditorClassIdentifier:
m_ScopedRegistriesSettingsExpanded: 1
oneTimeWarningShown: 0
m_Registries:

2
TestProjects/PerceptionHDRP/ProjectSettings/ProjectSettings.asset


metalEditorSupport: 1
metalAPIValidation: 1
iOSRenderExtraFrameOnPause: 0
iosCopyPluginsCodeInsteadOfSymlink: 0
appleDeveloperTeamID:
iOSManualSigningProvisioningProfileID:
tvOSManualSigningProvisioningProfileID:

XboxOneCapability: []
XboxOneGameRating: {}
XboxOneIsContentPackage: 0
XboxOneEnhancedXboxCompatibilityMode: 0
XboxOneEnableGPUVariability: 1
XboxOneSockets: {}
XboxOneSplashScreen: {fileID: 0}

4
TestProjects/PerceptionHDRP/ProjectSettings/ProjectVersion.txt


m_EditorVersion: 2019.4.12f1
m_EditorVersionWithRevision: 2019.4.12f1 (225e826a680e)
m_EditorVersion: 2019.4.16f1
m_EditorVersionWithRevision: 2019.4.16f1 (e05b6e02d63e)

10
.yamato/environments.yml


# sticking to 2019.4.6f1 for testing for now because Linux Editor fails to open PerceptionHDRP on 2019.4.8f1
# see https://fogbugz.unity3d.com/default.asp?1273518_d68j5lb6eucglb84
coverage_editors:
- version: 2019.4.6f1
- version: 2019.4.16f1
- version: 2019.4.6f1
- version: 2019.4.16f1
- version: 2019.4.6f1
- version: 2020.1.3f1
- version: 2019.4.16f1
# - version: 2020.1.3f1
- version: 2019.4.6f1
- version: 2019.4.16f1
# - version: 2020.1.15f1
# - version: 2020.2.0a21

6
.yamato/upm-ci-performance.yml


---
{% for editor in complete_editors %}
{% for editor in performance_editors %}
{% for suite in performance_suites %}
{% for project in projects %}
{{project.name}}_linux_{{suite.name}}_{{editor.version}}:

{% endfor %}
{% endfor %}
{% for editor in complete_editors %}
{% for editor in performance_editors %}
{% for suite in performance_suites %}
{% for project in projects %}
{{project.name}}_windows_{{suite.name}}_{{editor.version}}:

model: rtx2080
# model: rtx2080
image: package-ci/win10:stable
flavor: b1.large
commands:

3
.yamato/upm-ci-testprojects.yml


{{project.name}}_windows_{{suite.name}}_{{editor.version}}:
name : {{project.name}} {{ suite.display_name }} tests ({{ editor.version }}, Windows)
agent:
type: Unity::VM
type: Unity::VM::GPU
model: rtx2080
image: package-ci/win10:stable
flavor: b1.large
commands:

正在加载...
取消
保存