Skip to content

Commit c9535b3

Browse files
attenederatteneder
committed
Merge tag 'release/6.6.0' into openupm
Release 6.6.0
2 parents 561c9fd + 5fef3cd commit c9535b3

24 files changed

+374
-89
lines changed

‎.yamato/code-format-check.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ code_format_check:
88
image: {{ agent.image }}
99
flavor: {{ agent.flavor}}
1010
commands:
11-
- git clone --depth 1 --branch stable https://github.cds.internal.unity3d.com/unity/unity-meta.git
11+
- >
12+
GIT_CLONE_PROTECTION_ACTIVE=false
13+
git clone --depth 1 --branch stable https://github.cds.internal.unity3d.com/unity/unity-meta.git
1214
- mv unity-meta ~
1315
- perl ~/unity-meta/Tools/Format/format.pl --showfiles --dry-run .

‎.yamato/package-pack.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ pack:
1313
- |
1414
mkdir Packages
1515
pushd Packages
16-
git clone {% if platform.name == "win" %}"%GIT_REPOSITORY_URL%"{% else %}"$GIT_REPOSITORY_URL"{% endif %} --no-checkout gltfast
16+
git clone {% if agent.os == "win" %}"%GIT_REPOSITORY_URL%"{% else %}"$GIT_REPOSITORY_URL"{% endif %} --no-checkout gltfast
1717
cd gltfast
18-
git fetch origin {% if platform.name == "win" %}"%GIT_REVISION%"{% else %}"$GIT_REVISION"{% endif %}
19-
git checkout -f --detach {% if platform.name == "win" %}"%GIT_REVISION%"{% else %}"$GIT_REVISION"{% endif %}
18+
git fetch origin {% if agent.os == "win" %}"%GIT_REVISION%"{% else %}"$GIT_REVISION"{% endif %}
19+
git checkout -f --detach {% if agent.os == "win" %}"%GIT_REVISION%"{% else %}"$GIT_REVISION"{% endif %}
2020
popd
2121
- npm install upm-ci-utils@stable -g --registry {{ registry.npm }}
2222
- upm-ci package pack --package-path Packages/gltfast

‎.yamato/package-player-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ build_{{ platform.name }}_{{ editor.version }}:
3636

3737
- npm install upm-ci-utils@stable -g --registry {{ registry.npm }}
3838
- |
39-
{% if platform.windows_host -%}
39+
{% if agent.os == "win" -%}
4040
set GLTF_TEST_ASSET_DIR={{ os.yamato_source_dir }}\Assets
4141
{% else -%}
4242
export GLTF_TEST_ASSET_DIR="{{ os.yamato_source_dir }}/Assets"
@@ -89,7 +89,7 @@ run_{{ platform.name }}_{{ editor.version }}:
8989
{% endfor -%}
9090
- npm install upm-ci-utils@stable -g --registry {{ registry.npm }}
9191
- |
92-
{% if platform.name == "win" -%}
92+
{% if agent.os == "win" -%}
9393
set GLTF_TEST_ASSET_DIR={{ os.yamato_source_dir }}\Assets
9494
{% else -%}
9595
export GLTF_TEST_ASSET_DIR="{{ os.yamato_source_dir }}/Assets"
@@ -141,7 +141,7 @@ build_and_run_{{ platform.name }}_{{ editor.version }}:
141141

142142
- npm install upm-ci-utils@stable -g --registry {{ registry.npm }}
143143
- |
144-
{% if platform.name == "win" -%}
144+
{% if agent.os == "win" -%}
145145
set GLTF_TEST_ASSET_DIR={{ os.yamato_source_dir }}\Assets
146146
{% else -%}
147147
export GLTF_TEST_ASSET_DIR="{{ os.yamato_source_dir }}/Assets"

‎.yamato/package-test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
{% for editor in editor_versions -%}
55
{% for platform in test_platforms -%}
6-
{% if platform.name == "win" -%}{% assign os = os_variables.win -%}{% else -%}{% assign os = os_variables.unix -%}{% endif -%}
6+
{% assign agent = agents[platform.agent] -%}
7+
{% if agent.os == "win" -%}{% assign os = os_variables.win -%}{% else -%}{% assign os = os_variables.unix -%}{% endif -%}
78
test_{{ platform.name }}_{{ editor }}:
89
name : Test {{ editor }} on {{ platform.name }}
910
agent:
10-
{% assign agent = agents[platform.agent] -%}
1111
type: {{ agent.type }}
1212
image: {{ agent.image }}
1313
flavor: {{ agent.flavor}}
@@ -36,9 +36,9 @@ test_{{ platform.name }}_{{ editor }}:
3636
popd
3737
{% endfor -%}
3838

39-
- npm install {% if platform.name == "win" %}"%UPMCI_PKG%"{% else %}"$UPMCI_PKG"{% endif %} -g --registry {{ registry.npm }}
39+
- npm install {% if agent.os == "win" %}"%UPMCI_PKG%"{% else %}"$UPMCI_PKG"{% endif %} -g --registry {{ registry.npm }}
4040
- >
41-
{% if platform.name == "win" -%}
41+
{% if agent.os == "win" -%}
4242
set GLTF_TEST_ASSET_DIR={{ os.yamato_source_dir }}\Assets
4343
{% else -%}
4444
export GLTF_TEST_ASSET_DIR="{{ os.yamato_source_dir }}/Assets"
@@ -66,11 +66,11 @@ test_{{ platform.name }}_{{ editor }}:
6666
# Validation only occurs in editmode.
6767
{% for editor in editor_versions -%}
6868
{% for platform in test_platforms -%}
69-
{% if platform.name == "win" -%}{% assign os = os_variables.win -%}{% else -%}{% assign os = os_variables.unix -%}{% endif -%}
69+
{% assign agent = agents[platform.agent] -%}
70+
{% if agent.os == "win" -%}{% assign os = os_variables.win -%}{% else -%}{% assign os = os_variables.unix -%}{% endif -%}
7071
validate_{{ platform.name }}_{{ editor }}:
7172
name : Validate {{ editor }} on {{ platform.name }}
7273
agent:
73-
{% assign agent = agents[platform.agent] -%}
7474
type: {{ agent.type }}
7575
image: {{ agent.image }}
7676
flavor: {{ agent.flavor}}
@@ -99,9 +99,9 @@ validate_{{ platform.name }}_{{ editor }}:
9999
popd
100100
{% endfor -%}
101101

102-
- npm install {% if platform.name == "win" %}"%UPMCI_PKG%"{% else %}"$UPMCI_PKG"{% endif %} -g --registry {{ registry.npm }}
102+
- npm install {% if agent.os == "win" %}"%UPMCI_PKG%"{% else %}"$UPMCI_PKG"{% endif %} -g --registry {{ registry.npm }}
103103
- >
104-
{% if platform.name == "win" -%}
104+
{% if agent.os == "win" -%}
105105
set GLTF_TEST_ASSET_DIR={{ os.yamato_source_dir }}\Assets
106106
{% else -%}
107107
export GLTF_TEST_ASSET_DIR="{{ os.yamato_source_dir }}/Assets"

‎.yamato/package.metafile

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,42 @@ test_setups:
33
# see GLTFast.Editor.Tests.SetupProject.ApplySetup (Tests/Editor/SetupProject.cs) for details
44
- project_setup: default
55
# # Use to limit versions
6-
# editor_versions: [2020,2021,2022,2023.2,trunk]
6+
# editor_versions: [2020,2021,2022,6000]
77
# # Use to limit to platforms
88
# platforms: [win,mac,ubuntu]
9-
pr_sets:
9+
pr_test_subset:
1010
- platform: win
1111
editor: 2020
1212
- platform: mac
13-
editor: trunk
13+
editor: 6000
1414
- platform: win
1515
editor: 2022
16-
coverage_sets:
16+
pr_build_subset:
17+
- platform: mac
18+
editor: 2022
19+
coverage_subset:
1720
# default for coverage: windows + current LTS
1821
- platform: win
1922
editor: 2022
2023
- project_setup: minimalistic
21-
editor_versions: [2020,2022,trunk]
24+
editor_versions: [2020,2022,6000]
2225
platforms: [win]
23-
pr_sets:
26+
pr_test_subset:
2427
- platform: win
2528
editor: 2022
26-
coverage_sets:
29+
pr_build_subset:
30+
- platform: win
31+
editor: 2022
32+
coverage_subset:
2733
# default for coverage: windows + current LTS
2834
- platform: win
2935
editor: 2022
3036
- project_setup: all_defines
3137
render_pipeline: URP-Forward
32-
editor_versions: [2020,2021,2022,trunk]
38+
utr_timeout: 1200
39+
editor_versions: [2020,2021,2022,6000]
3340
platforms: [win]
34-
pr_sets:
41+
pr_test_subset:
3542
- platform: win
3643
editor: 2022
3744
# TODO: Move those to `urp` and `hdrp` test setup at some point
@@ -41,19 +48,24 @@ test_setups:
4148
- platform: win
4249
editor: 2021
4350
- platform: win
44-
editor: trunk
45-
coverage_sets:
51+
editor: 6000
52+
pr_build_subset:
53+
- platform: win
54+
editor: 6000
55+
coverage_subset:
4656
# default for coverage: windows + current LTS
4757
- platform: win
4858
editor: 2022
4959
- project_setup: hdrp
5060
render_pipeline: HDRP-Deferred
51-
editor_versions: [2022,trunk]
61+
utr_timeout: 3600
62+
agent_xlarge_required: !!bool true
63+
editor_versions: [2022,6000]
5264
platforms: [win]
53-
pr_sets:
65+
pr_test_subset:
5466
- platform: win
5567
editor: 2022
56-
coverage_sets:
68+
coverage_subset:
5769
# default for coverage: windows + current LTS
5870
- platform: win
5971
editor: 2022
@@ -62,8 +74,8 @@ editor_versions:
6274
- 2020
6375
- 2021
6476
- 2022
65-
- 2023.2
66-
- trunk
77+
- 6000
78+
# - trunk
6779

6880
platforms:
6981
win:
@@ -95,19 +107,17 @@ test_platforms:
95107

96108
player_test_editors:
97109
- version: 2020.3
98-
- version: trunk
110+
- version: 6000
99111

100112
player_test_platforms:
101113
- name: win
102114
id: standalone
103-
windows_host: !!bool true
104115
build_and_run: win
105116
- name: mac
106117
id: standalone
107118
build_and_run: mac
108119
- name: android
109120
id: android
110-
windows_host: !!bool true
111121
upm_ci_params: --backend=Il2Cpp
112122
build: win
113123
run: shield
@@ -130,41 +140,49 @@ agents:
130140
type: Unity::VM
131141
image: package-ci/win10:v4
132142
flavor: b1.large
143+
flavor_xlarge: b1.xlarge
133144
mac:
134145
os: mac
135146
type: Unity::VM::osx
136147
image: package-ci/macos-13:v4
137148
flavor: m1.mac
149+
flavor_xlarge: m1.mac
138150
ubuntu:
139151
os: linux
140152
type: Unity::VM
141153
image: package-ci/ubuntu-22.04:v4
142154
flavor: b1.large
155+
flavor_xlarge: b1.xlarge
143156
samsung:
144157
os: win
145158
type: Unity::mobile::samsung
146159
image: package-ci/win10:v4
147160
flavor: b1.large
161+
flavor_xlarge: b1.xlarge
148162
shield:
149163
os: win
150164
type: Unity::mobile::shield
151165
image: package-ci/win10:v4
152166
flavor: b1.large
167+
flavor_xlarge: b1.xlarge
153168
mac-intel:
154169
os: mac
155170
type: Unity::VM::osx
156171
image: package-ci/macos-13:v4
157172
flavor: b1.large
173+
flavor_xlarge: b1.xlarge
158174
mac-iphone:
159175
os: mac
160176
type: Unity::mobile::iPhone
161177
image: package-ci/macos-13:v4
162178
flavor: b1.large
179+
flavor_xlarge: b1.xlarge
163180
ubuntu-small:
164181
os: linux
165182
type: Unity::VM
166183
image: package-ci/ubuntu-22.04:v4
167184
flavor: b1.small
185+
flavor_xlarge: b1.xlarge
168186

169187
test_framework: [email protected]
170188

0 commit comments

Comments
 (0)