Skip to content

Commit 1ae454d

Browse files
alexander-suvorovalexander-suvorov
authored
Update to Unity 6000.0 (#6207)
* Upgrade projects to Unity 6000.0 * Upgrade obsolete Unity API * Use stable version of upm-ci-utils * Upgrade Wrench configuration to Unity 6000.0 * Use ubuntu-ci v1.0.0 for Yamato tests * Use b1.medium VM for the Pack test * Rely solely on IsEqualUsingDot quaternion comparison in the Pose inverse test due to float inaccuracy * Re-enable Unity trunk ml-agents tests * Use ubuntu-24.04 for pre-commit * Use ubuntu-22.04 for colab * Add missing PR references to the changelog
1 parent cfb26e3 commit 1ae454d

File tree

68 files changed

+395
-423
lines changed

Some content is hidden

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

68 files changed

+395
-423
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Please wrap in triple backticks (```) to make it easier to read.
2424
If applicable, add screenshots to help explain your problem.
2525

2626
**Environment (please complete the following information):**
27-
- Unity Version: [e.g. Unity 2023.2.12f1]
27+
- Unity Version: [e.g. Unity 6000.0.40f1]
2828
- OS + version: [e.g. Windows 10]
2929
- _ML-Agents version_: (e.g. ML-Agents v0.8, or latest `develop` branch from source)
3030
- _Torch version_: (you can run `pip3 show torch` to get this)

‎.github/workflows/colab.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
jobs:
1818
colab:
19-
runs-on: ubuntu-latest
19+
runs-on: ubuntu-22.04
2020
env:
2121
COLAB_ALWAYS_INSTALL_XVFB: 1
2222
QLEARNING_NUM_TRAINING_STEPS: 5

‎.github/workflows/pre-commit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ on:
1111

1212
jobs:
1313
pre-commit:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
1515
steps:
1616
- uses: actions/checkout@v4
1717
- uses: actions/setup-python@v5
1818
with:
1919
python-version: 3.10.x
2020
- uses: ruby/setup-ruby@v1
2121
env:
22-
ImageOS: ubuntu20
22+
ImageOS: ubuntu24
2323
with:
2424
ruby-version: '2.7'
2525
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

‎.yamato/com.unity.ml-agents-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ test_coverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}_{{ edi
1212
image: {{ platform.image }}
1313
flavor: {{ platform.flavor}}
1414
commands:
15-
- npm install upm-ci-utils@1.27.0 -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
15+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1616
- upm-ci project test -u {{ editor.version }} --type project-tests --project-path {{ editor.testProject }} --package-filter {{ package.name }} {{ coverageOptions }} --extra-utr-arg "reruncount=2"
1717
- |
1818
conda activate python3.10

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ pack:
22
name: Pack
33
agent:
44
type: Unity::VM
5-
image: ml-agents/ml-agents-ubuntu-18.04:latest
6-
flavor: b1.small
5+
image: ml-agents/ubuntu-ci:v1.0.0
6+
flavor: b1.medium
77
commands:
88
- |
99
eval "$($HOME/anaconda/bin/conda shell.bash hook)"
1010
conda activate python3.10
1111
python3 -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
12-
unity-downloader-cli -u 2023.2 -c editor --wait --fast
12+
unity-downloader-cli -u 6000.0 -c editor --wait --fast
1313
./.Editor/Unity -projectPath Project -batchMode -executeMethod Unity.MLAgents.SampleExporter.ExportCuratedSamples -logFile -
1414
npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1515
upm-ci project pack --project-path Project

‎.yamato/com.unity.ml-agents-promotion.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
test_editors:
2-
- version: 2023.2
2+
- version: 6000.0
33
test_platforms:
44
- name: win
55
type: Unity::VM
@@ -18,7 +18,7 @@ promotion_test_{{ platform.name }}_{{ editor.version }}:
1818
variables:
1919
UPMCI_PROMOTION: 1
2020
commands:
21-
- npm install upm-ci-utils@1.27.0 -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
21+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
2222
- upm-ci package test --unity-version {{ editor.version }} --package-path com.unity.ml-agents
2323
artifacts:
2424
logs:
@@ -48,7 +48,7 @@ promote:
4848
variables:
4949
UPMCI_PROMOTION: 1
5050
commands:
51-
- npm install upm-ci-utils@1.27.0 -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
51+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
5252
- upm-ci package promote --package-path com.unity.ml-agents
5353
# triggers:
5454
# tags:

‎.yamato/com.unity.ml-agents-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ publish:
77
variables:
88
UPMCI_ENABLE_PACKAGE_SIGNING: 1
99
commands:
10-
- npm install upm-ci-utils@1.27.0 -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
10+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
1111
- upm-ci package publish --package-path com.unity.ml-agents
1212
triggers:
1313
cancel_old_ci: true

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
{% metadata_file .yamato/coverage_tests.metafile %}
22
test_editors:
3-
- version: 2023.2
4-
# We want some scene tests to run in the DevProject, but packages there only support 2020+
3+
- version: 6000.0
54
testProject: Project
65
enableNoDefaultPackages: !!bool true
7-
- version: 2023.2
6+
- version: 6000.0
87
testProject: DevProject
98
enableNoDefaultPackages: !!bool true
109

1110
trunk_editor:
12-
# TODO: re-enable trunk tests after adding support for Unity 6. As of 12 Mar 2024, tests fail
13-
# with "Error: '6000.0.0b12' is not a valid Unity version"
14-
# - version: trunk
15-
# # Workaround for MLA-1596 - need to make sure we load the right results.
16-
# testProject: DevProject
11+
- version: trunk
12+
testProject: DevProject
1713

1814
test_platforms:
1915
- name: win
@@ -26,7 +22,7 @@ test_platforms:
2622
flavor: b1.large
2723
- name: linux
2824
type: Unity::VM
29-
image: ml-agents/ml-agents-ubuntu-18.04:latest
25+
image: ml-agents/ubuntu-ci:v1.0.0
3026
flavor: b1.large
3127

3228
packages:
@@ -81,7 +77,7 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}_{{ editor.testP
8177
image: {{ platform.image }}
8278
flavor: {{ platform.flavor}}
8379
commands:
84-
- npm install upm-ci-utils@1.27.0 -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
80+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
8581
- upm-ci package test -u {{ editor.version }} --package-path {{ package.name }} {{ noDefaultPackagesOptions }} --warnings-as-errors --extra-utr-arg "reruncount=2"
8682
artifacts:
8783
logs:
@@ -132,7 +128,7 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version}}_{{ editor.testPr
132128
{% endif %}
133129
python -m pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
134130
unity-downloader-cli -u trunk -c editor --wait --fast
135-
npm install upm-ci-utils@1.27.0 -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
131+
npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
136132
upm-ci project test -u {{ editor.version }} --project-path {{ editor.testProject }} --package-filter {{ package.name }} --extra-create-project-arg="-upmNoDefaultPackages" --extra-utr-arg "reruncount=2"
137133
artifacts:
138134
logs:

‎.yamato/compressed-sensor-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ test_compressed_obs_{{ editor.version }}_{{ editor.extra_test }}:
55
name: Test Compressed Sensor Observation {{ editor.version }} {{ editor.extra_test }}
66
agent:
77
type: Unity::VM
8-
image: ml-agents/ml-agents-ubuntu-18.04:latest
8+
image: ml-agents/ubuntu-ci:v1.0.0
99
flavor: b1.medium
1010
variables:
1111
UNITY_VERSION: {{ editor.version }}

‎.yamato/coverage_tests.metafile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
coverage_test_editors:
2-
- version: 2023.2
2+
- version: 6000.0
33
testProject: DevProject
44

55
coverage_test_platforms:
66
- name: linux
77
type: Unity::VM
8-
image: ml-agents/ml-agents-ubuntu-18.04:latest
8+
image: ml-agents/ubuntu-ci:v1.0.0
99
flavor: b1.medium
1010

1111
coverage_test_packages:

0 commit comments

Comments
 (0)