chore: update package.json (#229)

* update package.json * added jobs for dry-run * fixed yaml error * [skip ci] test * [skip ci] test * [skip ci] test * [skip ci] test * [skip ci] test * upgrade upm-ci-util
Unity-Technologies · Feb 26, 2020 · ab9efdf · ab9efdf
1 parent 2acd618
commit ab9efdf
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 59 deletions.
diff --git a/.yamato/promotion.yml b/.yamato/promotion.yml
@@ -1,15 +1,16 @@
 test_editors:
-  - version: 2019.1
+  - version: 2019.3
 test_platforms:
   - name: win
     type: Unity::VM
     image: package-ci/win10:stable
     flavor: b1.large
 packages:
-  - name: webrtc
   - name: renderstreaming
+    packagename: com.unity.renderstreaming
 ---
 
+{% for package in packages %}
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
 promotion_test_{{ platform.name }}_{{ editor.version }}:
@@ -21,36 +22,41 @@ promotion_test_{{ platform.name }}_{{ editor.version }}:
   variables:
     UPMCI_PROMOTION: 1
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - upm-ci package test --unity-version {{ editor.version }}
+    - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - upm-ci package test --unity-version {{ editor.version }} --package-path Packages/{{ package.packagename }}
   artifacts:
     logs:
       paths:
         - "upm-ci~/test-results/**/*"
   dependencies:
-{% for package in packages %}
     - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
 {% endfor %}
 {% endfor %}
-{% endfor %}
 
-promotion_test_trigger:
-  name: Promotion Tests Trigger
+promote_dry_run:
+  name: Promote Dry Run to Production
   agent:
     type: Unity::VM
     image: package-ci/win10:stable
     flavor: b1.large
+  variables:
+    UPMCI_PROMOTION: 1
+  commands:
+    - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - upm-ci package promote --dry-run --package-path Packages/{{ package.packagename }}
+  triggers:
+    tags:
+      only:
+        - /^(r|R)elease-\d+\.\d+\.\d+(-preview(\.\d+)?)?$/
   artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-    packages:
+    artifacts:
       paths:
-        - "upm-ci~/packages/**/*"
+        - "upm-ci~/packages/*.tgz"
   dependencies:
+    - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
-    - .yamato/promotion.yml#promotion_test_{{platform.name}}_{{editor.version}}
+    - .yamato/promotion.yml#promotion_test_{{ platform.name }}_{{ editor.version }}
 {% endfor %}
 {% endfor %}
 
@@ -63,8 +69,8 @@ promote:
   variables:
     UPMCI_PROMOTION: 1
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - upm-ci package promote
+    - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - upm-ci package promote --package-path Packages/{{ package.packagename }}
   triggers:
     tags:
       only:
@@ -74,11 +80,11 @@ promote:
       paths:
         - "upm-ci~/packages/*.tgz"
   dependencies:
-{% for package in packages %}
     - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
-{% endfor %}
 {% for editor in test_editors %}
 {% for platform in test_platforms %}
     - .yamato/promotion.yml#promotion_test_{{ platform.name }}_{{ editor.version }}
 {% endfor %}
+{% endfor %}
+
 {% endfor %}
diff --git a/.yamato/upm-ci-renderstreaming-packages.yml b/.yamato/upm-ci-renderstreaming-packages.yml
@@ -4,7 +4,6 @@
 packages:
   - name: renderstreaming
     packagename: com.unity.renderstreaming
-
 ---
 {% for package in packages %}
 pack_{{ package.name }}:
@@ -14,7 +13,7 @@ pack_{{ package.name }}:
     image: renderstreaming/win10:latest
     flavor: b1.large
   commands:
-    - npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
     - upm-ci package pack --package-path Packages/{{ package.packagename }}
   artifacts:
     {{ package.name }}_package:  
@@ -30,7 +29,7 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
     image: {{ platform.image }}
     flavor: {{ platform.flavor}}
   commands:
-    - npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
     - upm-ci package test -u {{ editor.version }} --package-path Packages/{{ package.packagename }}
   triggers:
     branches:
@@ -47,14 +46,39 @@ test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}:
 {% endfor %}
 {% endfor %}
 
+publish_dry_run_{{ package.name }}:
+  name: Publish Dry Run {{ package.packagename }}
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:stable
+    flavor: b1.large
+  commands:
+    - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - upm-ci package publish --dry-run --package-path Packages/{{ package.packagename }}
+  triggers:
+    tags:
+      only:
+        - /^(r|R)(c|C)-\d+\.\d+\.\d+(-preview(\.\d+)?)?$/
+  artifacts:  
+    {{ package.name }}_artifacts.zip:
+      paths:
+        - "upm-ci~/packages/*.tgz"
+  dependencies:
+    - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }}
+    {% for editor in editors %}
+    {% for platform in platforms %}
+    - .yamato/upm-ci-renderstreaming-packages.yml#test_{{ package.name }}_{{ platform.name }}_{{ editor.version }}
+    {% endfor %}
+    {% endfor %}
+
 publish_{{ package.name }}:
   name: Publish {{ package.packagename }}
   agent:
     type: Unity::VM
     image: package-ci/win10:stable
     flavor: b1.large
   commands:
-    - npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
     - upm-ci package publish --package-path Packages/{{ package.packagename }}
   triggers:
     tags:

diff --git a/.yamato/upm-ci-renderstreaming-unitypackage.yml b/.yamato/upm-ci-renderstreaming-unitypackage.yml
@@ -47,7 +47,7 @@ test_renderstreaming_sample_{{ sample.name }}_{{ platform.name }}_{{ editor.vers
     flavor: {{ platform.flavor}}
   commands:
     - {{ platform.copy_sample_command }} com.unity.renderstreaming {{ sample.name }}
-    - npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
     {% if platform.name == "win" %}
     - pip install unity-downloader-cli --extra-index-url https://artifactory.eu-cph-1.unityops.net/api/pypi/common-python/simple --upgrade
     {% else %}

diff --git a/.yamato/upm-ci-template.yml b/.yamato/upm-ci-template.yml
@@ -13,7 +13,7 @@ pack:
     image: renderstreaming/win10:latest
     flavor: b1.large
   commands:
-    - npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
     - upm-ci template pack
   artifacts:
     packages:
@@ -41,7 +41,7 @@ test_{{ platform.name }}_{{ editor.version }}:
     {% else %}
     - cp -r WebApp upm-ci~/templates/ProjectData~/
     {% endif %}
-    - npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - 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:
@@ -68,7 +68,7 @@ publish:
     image: package-ci/win10:stable
     flavor: b1.large
   commands:
-    - npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - npm install upm-ci-utils@latest -g --registry https://api.bintray.com/npm/unity/unity-npm
     - upm-ci template publish
   triggers:
     tags:

diff --git a/EmptyProjectForTest~/Packages/manifest.json b/EmptyProjectForTest~/Packages/manifest.json
@@ -7,7 +7,7 @@
     "com.unity.test-framework": "1.1.9",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.ugui": "1.0.0",
-    "com.unity.webrtc": "https://github.com/Unity-Technologies/com.unity.webrtc.git#release/1.1.0",
+    "com.unity.webrtc": "1.1.0-preview",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
@@ -39,11 +39,5 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
-  },
-  "lock": {
-    "com.unity.webrtc": {
-      "revision": "release/1.1.0",
-      "hash": "b00cafe0bc6fd7170eab00689eaafae2d1698299"
-    }
   }
 }
diff --git a/Packages/com.unity.renderstreaming/package.json b/Packages/com.unity.renderstreaming/package.json
@@ -1,11 +1,11 @@
 {
   "name": "com.unity.renderstreaming",
   "displayName": "Unity Render Streaming",
-  "version": "1.2.0-preview.1",
+  "version": "1.2.0-preview",
   "unity": "2019.3",
   "description": "This is a package for using Unity Render Streaming technology. It contains two samples to use the technology.",
   "dependencies": {
-    "com.unity.webrtc": "1.1.0-preview.3",
+    "com.unity.webrtc": "1.1.0-preview",
     "com.unity.inputsystem": "1.0.0-preview.4"
   },   
  "samples": [ {

diff --git a/Packages/com.unity.template.renderstreaming/package.json b/Packages/com.unity.template.renderstreaming/package.json
@@ -1,12 +1,12 @@
 {
   "name": "com.unity.template.renderstreaming",
   "displayName": "Unity Render Streaming Template",
-  "version": "1.2.0-preview.1",
+  "version": "1.2.0-preview",
   "type": "template",
   "unity": "2019.3",
   "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.1",
+    "com.unity.renderstreaming": "1.2.0-preview",
     "com.unity.render-pipelines.high-definition": "7.1.7"
   }
 }
diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -11,7 +11,6 @@
     "com.unity.test-framework": "1.1.9",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.ugui": "1.0.0",
-    "com.unity.webrtc": "https://github.com/Unity-Technologies/com.unity.webrtc.git#release/1.1.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
@@ -46,11 +45,5 @@
   },
   "testables": [
     "com.unity.webrtc"
-  ],
-  "lock": {
-    "com.unity.webrtc": {
-      "revision": "release/1.1.0",
-      "hash": "b00cafe0bc6fd7170eab00689eaafae2d1698299"
-    }
-  }
+  ]
 }
diff --git a/RenderStreamingSampleSrc~/RS_HDRPSampleSrc_1.x/Packages/manifest.json b/RenderStreamingSampleSrc~/RS_HDRPSampleSrc_1.x/Packages/manifest.json
@@ -9,7 +9,7 @@
     "com.unity.test-framework": "1.1.9",
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.ugui": "1.0.0",
-    "com.unity.webrtc": "https://github.com/Unity-Technologies/com.unity.webrtc.git#release/1.1.0",
+    "com.unity.webrtc": "1.1.0-preview",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
@@ -41,11 +41,5 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
-  },
-  "lock": {
-    "com.unity.webrtc": {
-      "revision": "release/1.1.0",
-      "hash": "b00cafe0bc6fd7170eab00689eaafae2d1698299"
-    }
   }
 }
diff --git a/RenderStreamingSampleSrc~/RS_URPSampleSrc/Packages/manifest.json b/RenderStreamingSampleSrc~/RS_URPSampleSrc/Packages/manifest.json
@@ -15,7 +15,7 @@
     "com.unity.textmeshpro": "2.0.1",
     "com.unity.timeline": "1.2.10",
     "com.unity.ugui": "1.0.0",
-    "com.unity.webrtc": "https://github.com/Unity-Technologies/com.unity.webrtc.git#release/1.1.0",
+    "com.unity.webrtc": "1.1.0-preview",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
@@ -47,11 +47,5 @@
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
     "com.unity.modules.xr": "1.0.0"
-  },
-  "lock": {
-    "com.unity.webrtc": {
-      "revision": "release/1.1.0",
-      "hash": "b00cafe0bc6fd7170eab00689eaafae2d1698299"
-    }
   }
 }