Skip to content

Commit 7abe359

Browse files
feat: update template 3.0.0 (#442)
* update hdrp template * update rtx template * fix rtx template * add template package test * add prepack process * skip convert symlink (meaning not run test about rtx template) * update changelog * fix review * fix review * [skip ci] fixed broken links * [skip ci] filter ValidationSuiteRun Co-authored-by: kazuki <[email protected]>
1 parent df04c73 commit 7abe359

File tree

50 files changed

+815
-829
lines changed

Some content is hidden

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

50 files changed

+815
-829
lines changed

.yamato/upm-ci-template.yml

+35-11
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,44 @@
33

44
---
55
{% for project in template_projects %}
6-
pack_{{ project.name }}:
7-
name: Pack {{ project.packagename }}
6+
7+
{% for editor in editors %}
8+
prepack_{{ project.name }}_{{ editor.version }}:
9+
name: Pre-Pack {{ project.packagename }} {{ editor.version }} - Primed Artifacts
10+
agent:
11+
type: Unity::VM
12+
image: package-ci/win10:stable
13+
flavor: b1.large
14+
commands:
15+
- pip install unity-downloader-cli --index-url {{ intra_pypi_url }} --upgrade
16+
- unity-downloader-cli -u {{ editor.version }} -c editor -w --fast
17+
# ToDO: windows vm can not use symbolic link
18+
# - FOR /F "usebackq" %%i IN (`dir /B /S /AL {{ project.packagename }}`) DO (call "BuildScripts~\convert_symlinks.cmd" %%i)
19+
- .Editor\Unity.exe -projectPath {{ project.packagename }} -batchmode -quit
20+
artifacts:
21+
primed:
22+
paths:
23+
- "{{ project.packagename }}/Library/Artifacts/**"
24+
- "{{ project.packagename }}/Library/ArtifactDB"
25+
- "{{ project.packagename }}/Library/SourceAssetDB"
26+
27+
pack_{{ project.name }}_{{ editor.version }}:
28+
name: Pack {{ project.packagename }} {{ editor.version }}
829
agent:
930
type: Unity::VM
10-
image: package-ci/ubuntu:stable
31+
image: package-ci/ubuntu:stable
1132
flavor: b1.large
1233
commands:
1334
- npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
14-
- find ./{{ project.packagename }} -type l -exec bash -c 'sh BuildScripts~/convert_symlinks.sh "$0"' {} \;
35+
- find ./{{ project.packagename }} -type l -exec bash -c 'sh BuildScripts~/convert_symlinks.sh "$0"' {} \;
1536
- upm-ci template pack --project-path {{ project.packagename }}
37+
dependencies:
38+
- .yamato/upm-ci-template.yml#prepack_{{ project.name }}_{{ editor.version }}
1639
artifacts:
1740
packages:
1841
paths:
1942
- "upm-ci~/**/*"
2043

21-
{% for editor in editors %}
22-
2344
{% for platform in platforms %}
2445
{% if platform.name == "win" -%}
2546
{% for param in platform.test_params %}
@@ -29,15 +50,18 @@ test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam
2950
type: {{ platform.type }}
3051
image: {{ platform.image }}
3152
flavor: {{ platform.flavor}}
53+
{% if project.name == "renderstreaming-rtx" %}
54+
model: rtx2080
55+
{% endif %}
3256
commands:
3357
- npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
34-
- upm-ci template test -u {{ editor.version }} --project-path {{ project.packagename }} --platform {{ param.platform }} --backend {{ param.backend }} --extra-utr-arg="--timeout=3000"
58+
- upm-ci template test -u {{ editor.version }} --project-path {{ project.packagename }} --platform {{ param.platform }} --backend {{ param.backend }} --extra-utr-arg="--timeout=3000 --testfilter=!ValidationSuiteRun"
3559
artifacts:
3660
logs:
3761
paths:
3862
- "upm-ci~/test-results/**/*"
3963
dependencies:
40-
- .yamato/upm-ci-template.yml#pack_{{ project.name }}
64+
- .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }}
4165
- .yamato/upm-ci-webapp.yml#pack_{{ platform.name }}
4266
{% endfor %}
4367
{% else -%}
@@ -57,7 +81,7 @@ test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam
5781
paths:
5882
- "upm-ci~/test-results/**/*"
5983
dependencies:
60-
- .yamato/upm-ci-template.yml#pack_{{ project.name }}
84+
- .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }}
6185
- .yamato/upm-ci-webapp.yml#pack_{{ platform.name }}
6286
{% endif -%}
6387
{% endfor %}
@@ -105,8 +129,8 @@ publish_{{ project.name }}:
105129
- "upm-ci~/packages/*.tgz"
106130
- "upm-ci~/templates/*.tgz"
107131
dependencies:
108-
- .yamato/upm-ci-template.yml#pack_{{ project.name }}
109132
{% for editor in editors %}
133+
- .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }}
110134
- .yamato/upm-ci-template.yml#trigger_template_test_{{ project.name }}_{{ editor.version }}
111135
{% endfor %}
112136

@@ -132,8 +156,8 @@ publish_dryrun_{{ project.name }}:
132156
- "upm-ci~/packages/*.tgz"
133157
- "upm-ci~/templates/*.tgz"
134158
dependencies:
135-
- .yamato/upm-ci-template.yml#pack_{{ project.name }}
136159
{% for editor in editors %}
160+
- .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }}
137161
- .yamato/upm-ci-template.yml#trigger_template_test_{{ project.name }}_{{ editor.version }}
138162
{% endfor %}
139163
{% endfor %}

BuildScripts~/convert_symlinks.cmd

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
set ESCAPED_PATH=%1
2+
set TEMP_SYMLINK=%ESCAPED_PATH%Temp
3+
echo
4+
echo --------------------------------------------------------------------------
5+
echo Converting symlinks to copies: %1
6+
echo --------------------------------------------------------------------------
7+
move %ESCAPED_PATH% %TEMP_SYMLINK%
8+
robocopy /MIR %TEMP_SYMLINK% %ESCAPED_PATH%
9+
del /Q %TEMP_SYMLINK%

com.unity.template.renderstreaming-hd/Assets/Readme.asset

+9-9
Original file line numberDiff line numberDiff line change
@@ -30,27 +30,27 @@ MonoBehaviour:
3030
- heading:
3131
text: To read more about Unity RenderStreaming please refer to the manual page.
3232
linkText: Unity Render Streaming (English)
33-
url: https://github.com/Unity-Technologies/UnityRenderStreaming/blob/stable/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/Documentation~/index.md
33+
url: https://docs.unity3d.com/Packages/com.unity.renderstreaming@3.0
3434
- heading:
3535
text: "\u65E5\u672C\u8A9E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8"
3636
linkText: Unity Render Streaming (Japanese)
37-
url: https://github.com/Unity-Technologies/UnityRenderStreaming/blob/stable/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/Documentation~/jp/index.md
37+
url: https://docs.unity3d.com/ja/Packages/com.unity.renderstreaming@3.0
3838
- heading: WebRTC Package
39-
text: The Unity WebRTC package implements Unity Render Streaming technology and provides
40-
C# WebRTC API for you to build WebRTC applications inside Unity. To read more
41-
about it please refer to the manual page
39+
text: The Unity WebRTC package implements Unity Render Streaming technology and
40+
provides C# WebRTC API for you to build WebRTC applications inside Unity. To
41+
read more about it please refer to the manual page
4242
linkText: WebRTC Package (English)
43-
url: https://github.com/Unity-Technologies/com.unity.webrtc/blob/stable/Documentation~/index.md
43+
url: https://docs.unity3d.com/Packages/com.unity.webrtc@2.3
4444
- heading:
4545
text: "\u65E5\u672C\u8A9E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8"
4646
linkText: WebRTC Package (Japanese)
47-
url: https://github.com/Unity-Technologies/com.unity.webrtc/blob/stable/Documentation~/jp/index.md
47+
url: https://docs.unity3d.com/ja/Packages/com.unity.webrtc@2.3
4848
- heading:
4949
text: This project uses the Package Manager to bring you the latest features
5050
Unity has to offer. Open the Package Manager from Windows > Package Manager
5151
and make sure you're using the most recent version of WebRTC package. To update
52-
packages, select your desired package from the list on the left, and click the
53-
Update to button in the bottom right corner.
52+
packages, select your desired package from the list on the left, and click
53+
the Update to button in the bottom right corner.
5454
linkText:
5555
url:
5656
loadedLayout: 1

0 commit comments

Comments
 (0)