From 6c8b2dcd2c86dc8f18a9fe2b618beae929e0634d Mon Sep 17 00:00:00 2001
From: Kazuki Matsumoto <1132081+karasusan@users.noreply.github.com>
Date: Wed, 26 Feb 2020 17:05:54 +0900
Subject: [PATCH] chore: fixed build process for template project (#231)

* [skip ci] fixed build process for template project

* [skip ci] fixed manifest.json

* [skip ci] fixed build error
---
 .yamato/upm-ci-publish-github-release.yml                | 6 +-----
 .yamato/upm-ci-template.yml                              | 7 -------
 Packages/com.unity.template.renderstreaming/package.json | 2 +-
 Packages/manifest.json                                   | 2 +-
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.yamato/upm-ci-publish-github-release.yml b/.yamato/upm-ci-publish-github-release.yml
index cfcaed4a7..dd529c393 100644
--- a/.yamato/upm-ci-publish-github-release.yml
+++ b/.yamato/upm-ci-publish-github-release.yml
@@ -5,14 +5,13 @@ packages:
   - name: renderstreaming
 ---
 publish_github_release:
-  name: Publish Github Release
+  name: Publish Template and Webapp to Github Release
   agent:
     type: Unity::VM
     image: package-ci/win10:stable
     flavor: b1.large
   commands:
     - npm install github-release-cli -g
-    - github-release upload -o "Unity-Technologies" -r "UnityRenderStreaming" -t "%GIT_TAG%" -n "%GIT_TAG%" "upm-ci~/packages/com.unity.renderstreaming-%GIT_TAG%.tgz"
     - github-release upload -o "Unity-Technologies" -r "UnityRenderStreaming" -t "%GIT_TAG%" -n "%GIT_TAG%" "upm-ci~/packages/com.unity.template.renderstreaming-%GIT_TAG%.tgz"
     - github-release upload -o "Unity-Technologies" -r "UnityRenderStreaming" -t "%GIT_TAG%" -n "%GIT_TAG%" "WebApp/bin~/webserver"
     - github-release upload -o "Unity-Technologies" -r "UnityRenderStreaming" -t "%GIT_TAG%" -n "%GIT_TAG%" "WebApp/bin~/webserver.exe"
@@ -21,9 +20,6 @@ publish_github_release:
       only:
         - /^(v|V)?\d+\.\d+\.\d+(-preview(\.\d+)?)?$/
   dependencies:
-    {% for package in packages%}
-    - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
-    {% endfor %}
     - .yamato/upm-ci-template.yml#pack
     {% for platform in platforms %}
     - .yamato/upm-ci-webapp.yml#pack_{{ platform.name }}
diff --git a/.yamato/upm-ci-template.yml b/.yamato/upm-ci-template.yml
index 95cec4495..8df0b6ae4 100644
--- a/.yamato/upm-ci-template.yml
+++ b/.yamato/upm-ci-template.yml
@@ -43,13 +43,6 @@ test_{{ platform.name }}_{{ editor.version }}:
     {% endif %}
     - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
     - upm-ci template test -u {{ editor.version }}
-# TODO:: `upm-ci template test` is failed using the package on the internal registry.
-#  triggers:
-#    branches:
-#      only:
-#      - "/.*/"
-#      except:
-#      - "master"
   artifacts:
     logs:
       paths:
diff --git a/Packages/com.unity.template.renderstreaming/package.json b/Packages/com.unity.template.renderstreaming/package.json
index 34582405a..6e6e857dc 100644
--- a/Packages/com.unity.template.renderstreaming/package.json
+++ b/Packages/com.unity.template.renderstreaming/package.json
@@ -7,6 +7,6 @@
   "description": "This is HDRP sample scene project integrated with Unity Render Streaming technology.\n\nAlong with its signaling web server, you could play around the scene in any webrtc supported web browser.",
   "dependencies": {
     "com.unity.renderstreaming": "1.2.0-preview",
-    "com.unity.render-pipelines.high-definition": "7.1.7"
+    "com.unity.render-pipelines.high-definition": "7.1.8"
   }
 }
\ No newline at end of file
diff --git a/Packages/manifest.json b/Packages/manifest.json
index f36db820f..20e88bb9a 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -7,7 +7,7 @@
     "com.unity.ide.vscode": "1.1.4",
     "com.unity.inputsystem": "1.0.0-preview.4",
     "com.unity.render-pipelines.high-definition": "7.1.8",
-    "com.unity.renderstreaming": "1.2.0-preview.1",
+    "com.unity.renderstreaming": "1.2.0-preview",
     "com.unity.test-framework": "1.1.9",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.ugui": "1.0.0",