Skip to content

Commit 25a284a

Browse files
author
Chris Elion
authored
Merge pull request #5167 from Unity-Technologies/MLA-1804-add-2021-tests
[MLA-1804] Update min version 2019.4, add 2021.1 tests
2 parents 6106277 + 8b002f7 commit 25a284a

File tree

49 files changed

+206
-155
lines changed

Some content is hidden

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

49 files changed

+206
-155
lines changed

.yamato/com.unity.ml-agents-pack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pack:
77
commands:
88
- |
99
python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
10-
unity-downloader-cli -u 2018.4 -c editor --wait --fast
10+
unity-downloader-cli -u 2019.4 -c editor --wait --fast
1111
./.Editor/Unity -projectPath Project -batchMode -executeMethod Unity.MLAgents.SampleExporter.ExportCuratedSamples -logFile -
1212
npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1313
upm-ci project pack --project-path Project

.yamato/com.unity.ml-agents-test.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
test_editors:
2-
- version: 2018.4
3-
# 2018.4 doesn't support code-coverage
4-
enableCodeCoverage: !!bool false
5-
# We want some scene tests to run in the DevProject, but packages there only support 2019+
6-
testProject: Project
7-
enableNoDefaultPackages: !!bool false
82
- version: 2019.4
93
enableCodeCoverage: !!bool true
10-
testProject: DevProject
4+
# We want some scene tests to run in the DevProject, but packages there only support 2020+
5+
testProject: Project
116
enableNoDefaultPackages: !!bool true
127
- version: 2020.2
138
enableCodeCoverage: !!bool true
149
testProject: DevProject
1510
enableNoDefaultPackages: !!bool true
11+
- version: 2021.1
12+
enableCodeCoverage: !!bool true
13+
testProject: DevProject
14+
enableNoDefaultPackages: !!bool true
1615

1716
trunk_editor:
1817
- version: trunk

.yamato/test_versions.metafile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# For each "other" test, we only run it against a single version of the
44
# editor to reduce the number of yamato jobs
55
test_editors:
6-
- version: 2018.4
7-
extra_test: llapi
86
- version: 2019.4
97
extra_test: gym
10-
- version: 2020.2
8+
- version: 2020.3
119
extra_test: sensor
10+
- version: 2021.1
11+
extra_test: llapi

DevProject/Packages/manifest.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,24 @@
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
55
"com.unity.ads": "3.6.1",
6-
"com.unity.analytics": "3.3.5",
6+
"com.unity.analytics": "3.5.3",
77
"com.unity.coding": "0.1.0-preview.13",
8-
"com.unity.collab-proxy": "1.2.16",
9-
"com.unity.ide.rider": "1.1.4",
8+
"com.unity.collab-proxy": "1.3.9",
9+
"com.unity.ide.rider": "2.0.7",
10+
"com.unity.ide.visualstudio": "2.0.7",
1011
"com.unity.ide.vscode": "1.2.3",
1112
"com.unity.inputsystem": "1.1.0-preview.3",
1213
"com.unity.ml-agents": "file:../../com.unity.ml-agents",
1314
"com.unity.ml-agents.extensions": "file:../../com.unity.ml-agents.extensions",
1415
"com.unity.multiplayer-hlapi": "1.0.8",
1516
"com.unity.package-manager-doctools": "1.7.0-preview",
1617
"com.unity.package-validation-suite": "0.19.0-preview",
17-
"com.unity.purchasing": "2.2.1",
18+
"com.unity.purchasing": "2.2.2",
1819
"com.unity.test-framework": "1.1.22",
1920
"com.unity.test-framework.performance": "2.2.0-preview",
2021
"com.unity.testtools.codecoverage": "1.0.0-pre.3",
21-
"com.unity.textmeshpro": "2.0.1",
22-
"com.unity.timeline": "1.2.12",
22+
"com.unity.textmeshpro": "3.0.1",
23+
"com.unity.timeline": "1.4.6",
2324
"com.unity.ugui": "1.0.0",
2425
"com.unity.xr.legacyinputhelpers": "2.1.7",
2526
"com.unity.modules.ai": "1.0.0",

DevProject/Packages/packages-lock.json

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
2323
},
2424
"com.unity.analytics": {
25-
"version": "3.3.5",
25+
"version": "3.5.3",
2626
"depth": 0,
2727
"source": "registry",
2828
"dependencies": {
@@ -31,7 +31,7 @@
3131
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
3232
},
3333
"com.unity.barracuda": {
34-
"version": "1.3.1-preview",
34+
"version": "1.3.2-preview",
3535
"depth": 1,
3636
"source": "registry",
3737
"dependencies": {
@@ -60,7 +60,7 @@
6060
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
6161
},
6262
"com.unity.collab-proxy": {
63-
"version": "1.2.16",
63+
"version": "1.3.9",
6464
"depth": 0,
6565
"source": "registry",
6666
"dependencies": {},
@@ -74,14 +74,23 @@
7474
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
7575
},
7676
"com.unity.ide.rider": {
77-
"version": "1.1.4",
77+
"version": "2.0.7",
7878
"depth": 0,
7979
"source": "registry",
8080
"dependencies": {
8181
"com.unity.test-framework": "1.1.1"
8282
},
8383
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
8484
},
85+
"com.unity.ide.visualstudio": {
86+
"version": "2.0.7",
87+
"depth": 0,
88+
"source": "registry",
89+
"dependencies": {
90+
"com.unity.test-framework": "1.1.9"
91+
},
92+
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
93+
},
8594
"com.unity.ide.vscode": {
8695
"version": "1.2.3",
8796
"depth": 0,
@@ -108,20 +117,19 @@
108117
"depth": 0,
109118
"source": "local",
110119
"dependencies": {
111-
"com.unity.barracuda": "1.3.1-preview",
120+
"com.unity.barracuda": "1.3.2-preview",
112121
"com.unity.modules.imageconversion": "1.0.0",
113122
"com.unity.modules.jsonserialize": "1.0.0",
114123
"com.unity.modules.physics": "1.0.0",
115-
"com.unity.modules.physics2d": "1.0.0",
116-
"com.unity.modules.unityanalytics": "1.0.0"
124+
"com.unity.modules.physics2d": "1.0.0"
117125
}
118126
},
119127
"com.unity.ml-agents.extensions": {
120128
"version": "file:../../com.unity.ml-agents.extensions",
121129
"depth": 0,
122130
"source": "local",
123131
"dependencies": {
124-
"com.unity.ml-agents": "1.8.0-preview"
132+
"com.unity.ml-agents": "2.0.0-exp.1"
125133
}
126134
},
127135
"com.unity.multiplayer-hlapi": {
@@ -169,7 +177,7 @@
169177
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
170178
},
171179
"com.unity.purchasing": {
172-
"version": "2.2.1",
180+
"version": "2.2.2",
173181
"depth": 0,
174182
"source": "registry",
175183
"dependencies": {
@@ -216,7 +224,7 @@
216224
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
217225
},
218226
"com.unity.textmeshpro": {
219-
"version": "2.0.1",
227+
"version": "3.0.1",
220228
"depth": 0,
221229
"source": "registry",
222230
"dependencies": {
@@ -225,10 +233,15 @@
225233
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
226234
},
227235
"com.unity.timeline": {
228-
"version": "1.2.12",
236+
"version": "1.4.6",
229237
"depth": 0,
230238
"source": "registry",
231-
"dependencies": {},
239+
"dependencies": {
240+
"com.unity.modules.director": "1.0.0",
241+
"com.unity.modules.animation": "1.0.0",
242+
"com.unity.modules.audio": "1.0.0",
243+
"com.unity.modules.particlesystem": "1.0.0"
244+
},
232245
"url": "https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-candidates"
233246
},
234247
"com.unity.ugui": {
@@ -406,6 +419,18 @@
406419
"depth": 0,
407420
"source": "builtin",
408421
"dependencies": {
422+
"com.unity.modules.ui": "1.0.0",
423+
"com.unity.modules.imgui": "1.0.0",
424+
"com.unity.modules.jsonserialize": "1.0.0",
425+
"com.unity.modules.uielementsnative": "1.0.0"
426+
}
427+
},
428+
"com.unity.modules.uielementsnative": {
429+
"version": "1.0.0",
430+
"depth": 1,
431+
"source": "builtin",
432+
"dependencies": {
433+
"com.unity.modules.ui": "1.0.0",
409434
"com.unity.modules.imgui": "1.0.0",
410435
"com.unity.modules.jsonserialize": "1.0.0"
411436
}

DevProject/ProjectSettings/EditorBuildSettings.asset

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ EditorBuildSettings:
88
- enabled: 1
99
path: Assets/ML-Agents/Scripts/Tests/Runtime/AcademyTest/AcademyStepperTestScene.unity
1010
guid: 9bafc50b1e55b43b2b1ae9620f1f8311
11-
m_configObjects: {}
11+
m_configObjects:
12+
com.unity.ml-agents.settings: {fileID: 11400000, guid: 7017f4eb06bef4889a3608a54b1cc59e,
13+
type: 2}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2019.4.20f1
2-
m_EditorVersionWithRevision: 2019.4.20f1 (6dd1c08eedfa)
1+
m_EditorVersion: 2020.3.0f1
2+
m_EditorVersionWithRevision: 2020.3.0f1 (c7b5465681fb)

Project/Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBall.demo.meta

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Project/Assets/ML-Agents/Examples/3DBall/Demos/Expert3DBallHard.demo.meta

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Project/Assets/ML-Agents/Examples/Basic/Demos/ExpertBasic.demo.meta

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)