Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 22a59aa

Browse files
Fix failing ci post upgrade (#6141)
* Update PerformancProject and DevProject. * Removed mac perf tests.
1 parent 2b50f60 commit 22a59aa

File tree

14 files changed

+389
-82
lines changed

14 files changed

+389
-82
lines changed
Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
1-
test_editors:
2-
- version: 2023.2
3-
---
4-
{% for editor in test_editors %}
5-
Run_Mac_Perfomance_Tests{{ editor.version }}:
6-
name: Run Mac Performance Tests {{ editor.version }}
7-
agent:
8-
type: Unity::VM::osx
9-
image: package-ci/macos-13:v4
10-
flavor: b1.large
11-
variables:
12-
UNITY_VERSION: {{ editor.version }}
13-
commands:
14-
- python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
15-
- unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast
16-
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
17-
- chmod +x ./utr
18-
- ./utr --suite=editor --platform=StandaloneOSX --editor-location=.Editor --testproject=PerformanceProject --artifacts_path=build/test-results --report-performance-data --performance-project-id=com.unity.ml-agents --zero-tests-are-ok=1
19-
triggers:
20-
cancel_old_ci: true
21-
recurring:
22-
- branch: develop
23-
frequency: daily
24-
artifacts:
25-
logs:
26-
paths:
27-
- "build/test-results/**"
28-
- "*.log"
29-
{% endfor %}
1+
#disabling mac perf tests until utr issue is resolved.
2+
#test_editors:
3+
# - version: 2023.2
4+
#---
5+
#{% for editor in test_editors %}
6+
#Run_Mac_Perfomance_Tests{{ editor.version }}:
7+
# name: Run Mac Performance Tests {{ editor.version }}
8+
# agent:
9+
# type: Unity::VM::osx
10+
# image: package-ci/macos-13:v4
11+
# flavor: b1.large
12+
# variables:
13+
# UNITY_VERSION: {{ editor.version }}
14+
# commands:
15+
# - python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
16+
# - unity-downloader-cli -u {{ editor.version }} -c editor --wait --fast
17+
# - curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
18+
# - chmod +x ./utr
19+
# - ./utr --suite=editor --platform=StandaloneOSX --editor-location=.Editor --testproject=PerformanceProject --artifacts_path=build/test-results --report-performance-data --performance-project-id=com.unity.ml-agents --zero-tests-are-ok=1
20+
# triggers:
21+
# cancel_old_ci: true
22+
# recurring:
23+
# - branch: develop
24+
# frequency: daily
25+
# artifacts:
26+
# logs:
27+
# paths:
28+
# - "build/test-results/**"
29+
# - "*.log"
30+
#{% endfor %}

‎DevProject/Packages/packages-lock.json‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,18 @@
2828
},
2929
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
3030
},
31+
"com.unity.collections": {
32+
"version": "2.2.1",
33+
"depth": 2,
34+
"source": "registry",
35+
"dependencies": {
36+
"com.unity.burst": "1.8.8",
37+
"com.unity.modules.unityanalytics": "1.0.0",
38+
"com.unity.nuget.mono-cecil": "1.11.4",
39+
"com.unity.test-framework.performance": "3.0.2"
40+
},
41+
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
42+
},
3143
"com.unity.ext.nunit": {
3244
"version": "2.0.5",
3345
"depth": 1,
@@ -56,7 +68,7 @@
5668
"depth": 0,
5769
"source": "local",
5870
"dependencies": {
59-
"com.unity.sentis": "1.3.0-pre.3",
71+
"com.unity.sentis": "2.0.0",
6072
"com.unity.modules.imageconversion": "1.0.0",
6173
"com.unity.modules.jsonserialize": "1.0.0",
6274
"com.unity.modules.physics": "1.0.0"
@@ -106,12 +118,12 @@
106118
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
107119
},
108120
"com.unity.sentis": {
109-
"version": "1.3.0-pre.3",
121+
"version": "2.0.0",
110122
"depth": 1,
111123
"source": "registry",
112124
"dependencies": {
113-
"com.unity.burst": "1.8.10",
114-
"com.unity.modules.jsonserialize": "1.0.0",
125+
"com.unity.burst": "1.8.12",
126+
"com.unity.collections": "2.2.1",
115127
"com.unity.modules.imageconversion": "1.0.0"
116128
},
117129
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"

‎DevProject/ProjectSettings/EditorBuildSettings.asset‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ EditorBuildSettings:
99
path: Assets/ML-Agents/Scripts/Tests/Runtime/AcademyTest/AcademyStepperTestScene.unity
1010
guid: 9bafc50b1e55b43b2b1ae9620f1f8311
1111
m_configObjects:
12-
com.unity.ml-agents.settings: {fileID: 11400000, guid: 87b8aebb5aefd4643821361876570855,
12+
com.unity.ml-agents.settings: {fileID: 11400000, guid: 8c1549da419d94fa285f5b29eab859e9,
1313
type: 2}
14+
m_UseUCBPForAssetBundles: 0
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!387306366 &1
4+
MemorySettings:
5+
m_ObjectHideFlags: 0
6+
m_EditorMemorySettings:
7+
m_MainAllocatorBlockSize: -1
8+
m_ThreadAllocatorBlockSize: -1
9+
m_MainGfxBlockSize: -1
10+
m_ThreadGfxBlockSize: -1
11+
m_CacheBlockSize: -1
12+
m_TypetreeBlockSize: -1
13+
m_ProfilerBlockSize: -1
14+
m_ProfilerEditorBlockSize: -1
15+
m_BucketAllocatorGranularity: -1
16+
m_BucketAllocatorBucketsCount: -1
17+
m_BucketAllocatorBlockSize: -1
18+
m_BucketAllocatorBlockCount: -1
19+
m_ProfilerBucketAllocatorGranularity: -1
20+
m_ProfilerBucketAllocatorBucketsCount: -1
21+
m_ProfilerBucketAllocatorBlockSize: -1
22+
m_ProfilerBucketAllocatorBlockCount: -1
23+
m_TempAllocatorSizeMain: -1
24+
m_JobTempAllocatorBlockSize: -1
25+
m_BackgroundJobTempAllocatorBlockSize: -1
26+
m_JobTempAllocatorReducedBlockSize: -1
27+
m_TempAllocatorSizeGIBakingWorker: -1
28+
m_TempAllocatorSizeNavMeshWorker: -1
29+
m_TempAllocatorSizeAudioWorker: -1
30+
m_TempAllocatorSizeCloudWorker: -1
31+
m_TempAllocatorSizeGfx: -1
32+
m_TempAllocatorSizeJobWorker: -1
33+
m_TempAllocatorSizeBackgroundWorker: -1
34+
m_TempAllocatorSizePreloadManager: -1
35+
m_PlatformMemorySettings: {}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!655991488 &1
4+
MultiplayerManager:
5+
m_ObjectHideFlags: 0
6+
m_EnableMultiplayerRoles: 0
7+
m_ActiveMultiplayerRole: 0
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &1
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 53
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
m_EnablePreReleasePackages: 0
16+
m_AdvancedSettingsExpanded: 1
17+
m_ScopedRegistriesSettingsExpanded: 1
18+
m_SeeAllPackageVersions: 0
19+
m_DismissPreviewPackagesInUse: 0
20+
oneTimeWarningShown: 0
21+
oneTimeDeprecatedPopUpShown: 0
22+
m_Registries:
23+
- m_Id: main
24+
m_Name:
25+
m_Url: https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates
26+
m_Scopes: []
27+
m_IsDefault: 1
28+
m_Capabilities: 0
29+
m_ConfigSource: 0
30+
m_UserSelectedRegistryName:
31+
m_UserAddingNewScopedRegistry: 0
32+
m_RegistryInfoDraft:
33+
m_Modified: 0
34+
m_ErrorMessage:
35+
m_UserModificationsInstanceId: -874
36+
m_OriginalInstanceId: -876
37+
m_LoadAssets: 0
Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
{
2+
"templatePinStates": [],
3+
"dependencyTypeInfos": [
4+
{
5+
"userAdded": false,
6+
"type": "UnityEngine.AnimationClip",
7+
"defaultInstantiationMode": 0
8+
},
9+
{
10+
"userAdded": false,
11+
"type": "UnityEditor.Animations.AnimatorController",
12+
"defaultInstantiationMode": 0
13+
},
14+
{
15+
"userAdded": false,
16+
"type": "UnityEngine.AnimatorOverrideController",
17+
"defaultInstantiationMode": 0
18+
},
19+
{
20+
"userAdded": false,
21+
"type": "UnityEditor.Audio.AudioMixerController",
22+
"defaultInstantiationMode": 0
23+
},
24+
{
25+
"userAdded": false,
26+
"type": "UnityEngine.ComputeShader",
27+
"defaultInstantiationMode": 1
28+
},
29+
{
30+
"userAdded": false,
31+
"type": "UnityEngine.Cubemap",
32+
"defaultInstantiationMode": 0
33+
},
34+
{
35+
"userAdded": false,
36+
"type": "UnityEngine.GameObject",
37+
"defaultInstantiationMode": 0
38+
},
39+
{
40+
"userAdded": false,
41+
"type": "UnityEditor.LightingDataAsset",
42+
"defaultInstantiationMode": 0
43+
},
44+
{
45+
"userAdded": false,
46+
"type": "UnityEngine.LightingSettings",
47+
"defaultInstantiationMode": 0
48+
},
49+
{
50+
"userAdded": false,
51+
"type": "UnityEngine.Material",
52+
"defaultInstantiationMode": 0
53+
},
54+
{
55+
"userAdded": false,
56+
"type": "UnityEditor.MonoScript",
57+
"defaultInstantiationMode": 1
58+
},
59+
{
60+
"userAdded": false,
61+
"type": "UnityEngine.PhysicMaterial",
62+
"defaultInstantiationMode": 0
63+
},
64+
{
65+
"userAdded": false,
66+
"type": "UnityEngine.PhysicsMaterial2D",
67+
"defaultInstantiationMode": 0
68+
},
69+
{
70+
"userAdded": false,
71+
"type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile",
72+
"defaultInstantiationMode": 0
73+
},
74+
{
75+
"userAdded": false,
76+
"type": "UnityEngine.Rendering.PostProcessing.PostProcessResources",
77+
"defaultInstantiationMode": 0
78+
},
79+
{
80+
"userAdded": false,
81+
"type": "UnityEngine.Rendering.VolumeProfile",
82+
"defaultInstantiationMode": 0
83+
},
84+
{
85+
"userAdded": false,
86+
"type": "UnityEditor.SceneAsset",
87+
"defaultInstantiationMode": 1
88+
},
89+
{
90+
"userAdded": false,
91+
"type": "UnityEngine.Shader",
92+
"defaultInstantiationMode": 1
93+
},
94+
{
95+
"userAdded": false,
96+
"type": "UnityEngine.ShaderVariantCollection",
97+
"defaultInstantiationMode": 1
98+
},
99+
{
100+
"userAdded": false,
101+
"type": "UnityEngine.Texture",
102+
"defaultInstantiationMode": 0
103+
},
104+
{
105+
"userAdded": false,
106+
"type": "UnityEngine.Texture2D",
107+
"defaultInstantiationMode": 0
108+
},
109+
{
110+
"userAdded": false,
111+
"type": "UnityEngine.Timeline.TimelineAsset",
112+
"defaultInstantiationMode": 0
113+
}
114+
],
115+
"defaultDependencyTypeInfo": {
116+
"userAdded": false,
117+
"type": "<default_scene_template_dependencies>",
118+
"defaultInstantiationMode": 1
119+
},
120+
"newSceneOverride": 0
121+
}

‎DevProject/ProjectSettings/TimeManager.asset‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
--- !u!5 &1
44
TimeManager:
55
m_ObjectHideFlags: 0
6-
Fixed Timestep: 0.02
6+
Fixed Timestep:
7+
m_Count: 2822399
8+
m_Rate:
9+
m_Denominator: 1
10+
m_Numerator: 141120000
711
Maximum Allowed Timestep: 0.33333334
812
m_TimeScale: 1
913
Maximum Particle Timestep: 0.03
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!890905787 &1
4+
VersionControlSettings:
5+
m_ObjectHideFlags: 0
6+
m_Mode: Visible Meta Files
7+
m_CollabEditorSettings:
8+
inProgressEnabled: 1
9+
m_TrackPackagesOutsideProject: 0

‎PerformanceProject/Packages/manifest.json‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
{
2+
"registry": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates",
23
"dependencies": {
3-
"com.unity.collab-proxy": "2.2.0",
4-
"com.unity.feature.development": "1.0.1",
4+
"com.unity.collab-proxy": "2.3.1",
5+
"com.unity.feature.development": "1.0.2",
56
"com.unity.ml-agents": "file:../../com.unity.ml-agents",
7+
"com.unity.test-framework.build": "0.0.1-preview.15",
68
"com.unity.test-framework.performance": "3.0.3",
7-
"com.unity.timeline": "1.7.6",
8-
"com.unity.ugui": "1.0.0",
9+
"com.unity.test-framework.utp-reporter": "1.1.0-preview",
10+
"com.unity.timeline": "1.8.6",
11+
"com.unity.ugui": "2.0.0",
912
"com.unity.visualscripting": "1.9.1",
1013
"com.unity.modules.ai": "1.0.0",
1114
"com.unity.modules.androidjni": "1.0.0",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /