Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions .yamato/upm-ci-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,44 @@

---
{% for project in template_projects %}
pack_{{ project.name }}:
name: Pack {{ project.packagename }}

{% for editor in editors %}
prepack_{{ project.name }}_{{ editor.version }}:
name: Pre-Pack {{ project.packagename }} {{ editor.version }} - Primed Artifacts
agent:
type: Unity::VM
image: package-ci/win10:stable
flavor: b1.large
commands:
- pip install unity-downloader-cli --index-url {{ intra_pypi_url }} --upgrade
- unity-downloader-cli -u {{ editor.version }} -c editor -w --fast
# ToDO: windows vm can not use symbolic link
# - FOR /F "usebackq" %%i IN (`dir /B /S /AL {{ project.packagename }}`) DO (call "BuildScripts~\convert_symlinks.cmd" %%i)
- .Editor\Unity.exe -projectPath {{ project.packagename }} -batchmode -quit
artifacts:
primed:
paths:
- "{{ project.packagename }}/Library/Artifacts/**"
- "{{ project.packagename }}/Library/ArtifactDB"
- "{{ project.packagename }}/Library/SourceAssetDB"

pack_{{ project.name }}_{{ editor.version }}:
name: Pack {{ project.packagename }} {{ editor.version }}
agent:
type: Unity::VM
image: package-ci/ubuntu:stable
image: package-ci/ubuntu:stable
flavor: b1.large
commands:
- npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
- find ./{{ project.packagename }} -type l -exec bash -c 'sh BuildScripts~/convert_symlinks.sh "$0"' {} \;
- find ./{{ project.packagename }} -type l -exec bash -c 'sh BuildScripts~/convert_symlinks.sh "$0"' {} \;
- upm-ci template pack --project-path {{ project.packagename }}
dependencies:
- .yamato/upm-ci-template.yml#prepack_{{ project.name }}_{{ editor.version }}
artifacts:
packages:
paths:
- "upm-ci~/**/*"

{% for editor in editors %}

{% for platform in platforms %}
{% if platform.name == "win" -%}
{% for param in platform.test_params %}
Expand All @@ -29,15 +50,18 @@ test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam
type: {{ platform.type }}
image: {{ platform.image }}
flavor: {{ platform.flavor}}
{% if project.name == "renderstreaming-rtx" %}
model: rtx2080
{% endif %}
commands:
- npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }}
- upm-ci template test -u {{ editor.version }} --project-path {{ project.packagename }} --platform {{ param.platform }} --backend {{ param.backend }} --extra-utr-arg="--timeout=3000"
- upm-ci template test -u {{ editor.version }} --project-path {{ project.packagename }} --platform {{ param.platform }} --backend {{ param.backend }} --extra-utr-arg="--timeout=3000 --testfilter=!ValidationSuiteRun"
artifacts:
logs:
paths:
- "upm-ci~/test-results/**/*"
dependencies:
- .yamato/upm-ci-template.yml#pack_{{ project.name }}
- .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }}
- .yamato/upm-ci-webapp.yml#pack_{{ platform.name }}
{% endfor %}
{% else -%}
Expand All @@ -57,7 +81,7 @@ test_{{ project.name }}_{{ param.platform }}_{{ param.backend }}_{{ platform.nam
paths:
- "upm-ci~/test-results/**/*"
dependencies:
- .yamato/upm-ci-template.yml#pack_{{ project.name }}
- .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }}
- .yamato/upm-ci-webapp.yml#pack_{{ platform.name }}
{% endif -%}
{% endfor %}
Expand Down Expand Up @@ -105,8 +129,8 @@ publish_{{ project.name }}:
- "upm-ci~/packages/*.tgz"
- "upm-ci~/templates/*.tgz"
dependencies:
- .yamato/upm-ci-template.yml#pack_{{ project.name }}
{% for editor in editors %}
- .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }}
- .yamato/upm-ci-template.yml#trigger_template_test_{{ project.name }}_{{ editor.version }}
{% endfor %}

Expand All @@ -132,8 +156,8 @@ publish_dryrun_{{ project.name }}:
- "upm-ci~/packages/*.tgz"
- "upm-ci~/templates/*.tgz"
dependencies:
- .yamato/upm-ci-template.yml#pack_{{ project.name }}
{% for editor in editors %}
- .yamato/upm-ci-template.yml#pack_{{ project.name }}_{{ editor.version }}
- .yamato/upm-ci-template.yml#trigger_template_test_{{ project.name }}_{{ editor.version }}
{% endfor %}
{% endfor %}
9 changes: 9 additions & 0 deletions BuildScripts~/convert_symlinks.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
set ESCAPED_PATH=%1
set TEMP_SYMLINK=%ESCAPED_PATH%Temp
echo
echo --------------------------------------------------------------------------
echo Converting symlinks to copies: %1
echo --------------------------------------------------------------------------
move %ESCAPED_PATH% %TEMP_SYMLINK%
robocopy /MIR %TEMP_SYMLINK% %ESCAPED_PATH%
del /Q %TEMP_SYMLINK%
18 changes: 9 additions & 9 deletions com.unity.template.renderstreaming-hd/Assets/Readme.asset
Original file line number Diff line number Diff line change
Expand Up @@ -30,27 +30,27 @@ MonoBehaviour:
- heading:
text: To read more about Unity RenderStreaming please refer to the manual page.
linkText: Unity Render Streaming (English)
url: https://github.com/Unity-Technologies/UnityRenderStreaming/blob/stable/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/Documentation~/index.md
url: https://docs.unity3d.com/Packages/com.unity.renderstreaming@3.0
- heading:
text: "\u65E5\u672C\u8A9E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8"
linkText: Unity Render Streaming (Japanese)
url: https://github.com/Unity-Technologies/UnityRenderStreaming/blob/stable/com.unity.template.renderstreaming-hd/Packages/com.unity.template.renderstreaming/Documentation~/jp/index.md
url: https://docs.unity3d.com/ja/Packages/com.unity.renderstreaming@3.0
- heading: WebRTC Package
text: The Unity WebRTC package implements Unity Render Streaming technology and provides
C# WebRTC API for you to build WebRTC applications inside Unity. To read more
about it please refer to the manual page
text: The Unity WebRTC package implements Unity Render Streaming technology and
provides C# WebRTC API for you to build WebRTC applications inside Unity. To
read more about it please refer to the manual page
linkText: WebRTC Package (English)
url: https://github.com/Unity-Technologies/com.unity.webrtc/blob/stable/Documentation~/index.md
url: https://docs.unity3d.com/Packages/com.unity.webrtc@2.3
- heading:
text: "\u65E5\u672C\u8A9E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8"
linkText: WebRTC Package (Japanese)
url: https://github.com/Unity-Technologies/com.unity.webrtc/blob/stable/Documentation~/jp/index.md
url: https://docs.unity3d.com/ja/Packages/com.unity.webrtc@2.3
- heading:
text: This project uses the Package Manager to bring you the latest features
Unity has to offer. Open the Package Manager from Windows > Package Manager
and make sure you're using the most recent version of WebRTC package. To update
packages, select your desired package from the list on the left, and click the
Update to button in the bottom right corner.
packages, select your desired package from the list on the left, and click
the Update to button in the bottom right corner.
linkText:
url:
loadedLayout: 1
Loading