Merge pull request #467 from Unity-Technologies/yamato-ci_DCC-230

Setup for Yamato CI (DCC-230)

Author: Mark Visser

.gitignore

@@ -79,5 +79,3 @@ TestProjects/FbxTests/Logs/*
 com.unity.formats.fbx/Editor/Integrations~/**
 com.unity.formats.fbx/CHANGELOG.md
 com.unity.formats.fbx/LICENSE.md
-com.unity.formats.fbx/package.json
-

.yamato/upm-ci.yml

@@ -0,0 +1,115 @@
+editors:
+  - version: 2018.3
+  - version: 2019.1
+  - version: 2019.2
+platforms:
+  - name: win
+    type: Unity::VM
+    image: package-ci/win10:stable
+    flavor: m1.large
+  - name: mac
+    type: Unity::VM::osx
+    image: buildfarm/mac:stable
+    flavor: m1.mac
+---
+pack:
+  name: Pack
+  agent:
+    type: Unity::VM
+    image: package-ci/ubuntu:latest
+    flavor: m1.large
+  commands:
+    - ./build.sh
+    - npm install -g upm-ci-utils@latest --registry https://api.bintray.com/npm/unity/unity-npm
+    - upm-ci package pack --package-path com.unity.formats.fbx
+  artifacts:
+   packages:
+     paths:
+       - "upm-ci~/packages/**/*"
+   build:
+     paths:
+       - "com.unity.formats.fbx/*"
+
+{% for editor in editors %}
+{% for platform in platforms %}
+test_{{ platform.name }}_{{ editor.version }}:
+  name : Test version {{ editor.version }} on {{ platform.name }}
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor}}
+  commands:
+    - git clone --branch dev --single-branch [email protected]:upm-packages/project-templates/upm-template-utils.git upm-ci-utils
+    - npm install upm-ci-utils/ -g
+    - upm-ci package test --unity-version {{ editor.version }} --package-path com.unity.formats.fbx
+  artifacts:
+    logs.zip:
+      paths:
+        - "upm-ci~/logs/**/*"
+        - "upm-ci~/test-results/**/*"
+    artifacts.zip:
+      paths:
+        - "upm-ci~/packages/**/*"
+        - "upm-ci~/templates/**/*"
+  dependencies:
+    - .yamato/upm-ci.yml#pack
+{% endfor %}
+{% endfor %}
+
+test_trigger:
+  name: Tests Trigger
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:stable
+    flavor: m1.large
+  commands:
+    - dir
+  triggers:
+    branches:
+      only:
+        - "/.*/"
+      except:
+        - master
+  artifacts:
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+    packages:
+      paths:
+        - "upm-ci~/packages/**/*"
+  dependencies:
+    - .yamato/upm-ci.yml#pack
+    {% for editor in editors %}
+    {% for platform in platforms %}
+    - .yamato/upm-ci.yml#test_{{platform.name}}_{{editor.version}}
+    {% endfor %}
+    {% endfor %}
+
+publish:
+  name: Publish
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:latest
+    flavor: m1.large
+    name: Runner
+  commands:
+    - npm install upm-ci-utils -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - upm-ci package publish
+  triggers:
+    tags:
+      only:
+        - /^(v|V)[0-9]+.[0-9]+.[0-9]+/
+  artifacts:
+    logs.zip:
+      paths:
+        - "upm-ci~/logs/**/*"
+        - "upm-ci~/test-results/**/*"
+    Package.zip:
+      paths:
+        - "upm-ci~/package/*.tgz"
+  dependencies:
+  {% for editor in editors %}
+  {% for platform in platforms %}
+    - .yamato/upm-ci.yml#test_{{ platform.name }}_{{ editor.version }}
+  {% endfor %}  
+  {% endfor %}

CMakeLists.txt

@@ -5,28 +5,6 @@ MESSAGE(STATUS "CMAKE_INSTALL_PREFIX is: " ${CMAKE_INSTALL_PREFIX})
 
 project (UnityFbxExporterEditorPackage NONE)
 
-###########################################################################
-
-# Get git tag as package version
-find_package(Git REQUIRED)
-execute_process(COMMAND ${GIT_EXECUTABLE} describe --tags HEAD
-        OUTPUT_VARIABLE PACKAGE_VERSION
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-# only keep x.y.z[-preview.n]
-string(REGEX REPLACE "^.*([0-9]\.[0-9]\.[0-9].*)$" "\\1" PACKAGE_VERSION "${PACKAGE_VERSION}")
-
-# Get git revision hash as package revision
-execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
-        OUTPUT_VARIABLE PACKAGE_REVISION
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-# Get git repo url
-execute_process(COMMAND ${GIT_EXECUTABLE} config --get remote.origin.url
-        OUTPUT_VARIABLE PACKAGE_REPO_URL
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-configure_file(${CMAKE_SOURCE_DIR}/package.json.in ${CMAKE_BINARY_DIR}/package.json @ONLY)
-
 ###########################################################################
 # Zip integrations folder
 
@@ -83,7 +61,7 @@ install(
     DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx/Editor/Integrations~"
 )
 install(
-    FILES "${CMAKE_SOURCE_DIR}/CHANGELOG.md" "${CMAKE_SOURCE_DIR}/LICENSE.md" "${CMAKE_BINARY_DIR}/package.json"
+    FILES "${CMAKE_SOURCE_DIR}/CHANGELOG.md" "${CMAKE_SOURCE_DIR}/LICENSE.md"
     DESTINATION "${CMAKE_INSTALL_PREFIX}/com.unity.formats.fbx"
 )
 

TestProjects/FbxTests/Packages/manifest.json

@@ -4,7 +4,6 @@
     "com.unity.analytics": "3.2.2",
     "com.unity.collab-proxy": "1.2.15",
     "com.unity.formats.fbx": "file:../../../com.unity.formats.fbx",
-    "com.unity.formats.fbx.tests": "file:../../../com.unity.formats.fbx.tests",
     "com.unity.package-manager-ui": "2.1.1",
     "com.unity.package-validation-suite": "0.4.0-preview.13",
     "com.unity.purchasing": "2.0.1",

com.unity.formats.fbx.tests/package.json

@@ -0,0 +1 @@
+{"createSeparatePackage": true}