chore: merge release into master

.github/workflows/conventional-pr.yml

@@ -0,0 +1,39 @@
+name: Conventional PR
+
+# Controls when the action will run. 
+on:
+  pull_request:
+    branches:
+    - master
+    - develop
+    - release/**
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - name: semantic-pull-request
+        # Internal Unity mirror available at jesseo/action-semantic-pull-request, but actions from private repos aren't supported, so continue to use the public one below
+        uses: amannn/action-semantic-pull-request@b7a9a97cb10fa6e1ae02647e718798175f6b1f1d
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # Provide custom types if you don't want the default ones from https://www.conventionalcommits.org
+          types: # optional
+          # Configure which scopes are allowed.
+          #scopes: # optional
+          # Configure that a scope must always be provided.
+          #requireScope: # optional
+          # Configure additional validation for the subject based on a regex. E.g. '^(?![A-Z]).+$' ensures the subject doesn't start with an uppercase character.
+          #subjectPattern: # optional
+          # If `subjectPattern` is configured, you can use this property to override the default error message that is shown when the pattern doesn't match. The variables `subject` and `title` can be used within the message.
+          #subjectPatternError: # optional
+          # For work-in-progress PRs you can typically use draft pull requests from Github. However, private repositories on the free plan don't have this option and therefore this action allows you to opt-in to using the special '[WIP]' prefix to indicate this state. This will avoid the validation of the PR title and the pull request checks remain pending. Note that a second check will be reported if this is enabled.
+          #wip: # optional
+          # When using "Squash and merge" on a PR with only one commit, GitHub will suggest using that commit message instead of the PR title for the merge commit, and it's easy to commit this by mistake. Enable this option to also validate the commit message for one commit PRs.
+          validateSingleCommit: true # optional

.gitignore

@@ -49,13 +49,11 @@ artifacts/
 *_p.c
 *_i.h
 *.ilk
-*.meta
 *.obj
 *.pch
 *.pdb
 *.pgc
 *.pgd
-*.rsp
 *.sbr
 *.tlb
 *.tli
@@ -155,6 +153,8 @@ PublishScripts/
 *.nupkg
 # The packages folder can be ignored because of Package Restore
 **/packages/*
+# Except Unity testproject Packages
+!/testproject/Packages/**
 # except build/, which is used as an MSBuild target.
 !**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
@@ -186,7 +186,6 @@ _pkginfo.txt
 # Others
 ClientBin/
 ~$*
-*~
 *.dbmdl
 *.dbproj.schemaview
 *.jfm
@@ -261,4 +260,7 @@ __pycache__/
 *.pyc
 
 # Docs
-docs/LastBuild.log
+docs/LastBuild.log
+
+# Unity Package Manager CI output
+upm-ci~

.yamato/project-pack.yml

@@ -0,0 +1,17 @@
+{% metadata_file .yamato/project.metafile %}
+---
+{% for project in projects -%}
+pack_{{ project.name }}:
+  name: Pack {{ project.name }}
+  agent:
+    type: Unity::VM
+    image: package-ci/ubuntu:stable
+    flavor: b1.small
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci project pack --project-path {{ project.path }}
+  artifacts:
+    packages:
+      paths:
+        - "upm-ci~/packages/**/*"
+{% endfor -%}

.yamato/project-promotion.yml

@@ -0,0 +1,66 @@
+{% metadata_file .yamato/project.metafile %}
+---
+{% for project in projects -%}
+{% for package in project.packages -%}
+# Validation job for package {{ package.name }}, only using the first entry in the
+# platform and editor meta data
+promotion_validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}:
+  name : Validate Project {{ project.name }} - Package {{ package.name }} - {{ test_editors.first }} on {{ test_platforms.first.name }}
+  agent:
+    type: {{ test_platforms.first.type }}
+    image: {{ test_platforms.first.image }}
+    flavor: {{ test_platforms.first.flavor}}
+  variables:
+    UPMCI_PROMOTION: 1
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci project test -u {{ test_editors.first }} --project-path {{ project.path }} --type vetting-tests --package-filter {{ package.name }}
+  artifacts:
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+  dependencies:
+    - .yamato/project-pack.yml#pack_{{ project.name }}
+
+promote_{{ project.name }}_{{ package.name }}:
+  name: Promote Project {{ project.name }} - Package {{ package.name }} to Production
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:stable
+    flavor: b1.small
+  variables:
+    UPMCI_PROMOTION: 1
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci package promote --package-path {{ package.path }}
+  artifacts:
+    artifacts:
+      paths:
+        - "upm-ci~/packages/*.tgz"
+  dependencies:
+    - .yamato/project-pack.yml#pack_{{ project.name }}
+    - .yamato/project-promotion.yml#promotion_validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
+
+{% endfor -%}
+
+promote_{{ project.name }}:
+  name: Promote ALL {{ project.name }} packages to Production
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:stable
+    flavor: b1.small
+  variables:
+    UPMCI_PROMOTION: 1
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci project promote --project-path {{ project.path }}
+  artifacts:
+    artifacts:
+      paths:
+        - "upm-ci~/packages/*.tgz"
+  dependencies:
+    - .yamato/project-pack.yml#pack_{{ project.name }}
+{% for package in packages -%}
+    - .yamato/project-promotion.yml#promotion_validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
+{% endfor -%}
+{% endfor -%}

.yamato/project-publish.yml

@@ -0,0 +1,46 @@
+{% metadata_file .yamato/project.metafile %}
+---
+{% for project in projects -%}
+{% for package in project.packages -%}
+publish_{{ project.name }}_{{ package.name }}:
+  name: Publish Project {{project.name }} - Package {{ package.name }} to Internal Registry
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:stable
+    flavor: b1.large
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci package publish --package-path {{ package.path }}
+  artifacts:
+    artifacts:
+      paths:
+        - "upm-ci~/packages/*.tgz"
+  dependencies:
+    - .yamato/project-pack.yml#pack_{{ project.name }}
+    - .yamato/project-test.yml#validate_{{ project.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
+{% for editor in test_editors -%}
+{% for platform in test_platforms -%}
+    - .yamato/project-test.yml#test_{{ project.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}
+{% endfor -%}
+{% endfor -%}
+
+{% endfor -%}
+
+publish_{{ project.name }}:
+  name: Publish ALL {{ project.name }} packages to Internal Registry
+  agent:
+    type: Unity::VM
+    image: package-ci/win10:stable
+    flavor: b1.large
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci project publish --project-path {{ project.path }}
+  artifacts:
+    artifacts:
+      paths:
+        - "upm-ci~/packages/*.tgz"
+  dependencies:
+    - .yamato/project-pack.yml#pack_{{ project.name }}
+    - .yamato/project-test.yml#all_tests_trigger
+
+{% endfor -%}

.yamato/project-test.yml

@@ -0,0 +1,137 @@
+{% metadata_file .yamato/project.metafile %}
+---
+# Go through all platforms, editors and packages in the metadata
+# to generate its independent package tests and validation tests.
+# The idea is to only run validation once per package and not mix.
+# the results with package tests
+{% for package in projects.first.packages -%}
+{% for editor in test_editors -%}
+{% for platform in test_platforms -%}
+test_{{ projects.first.name}}_{{ package.name }}_{{ platform.name }}_{{ editor }}:
+  name : Test Project {{ projects.first.name }} - Package {{ package.name }} - {{ editor }} on {{ platform.name }}
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor}}
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --project-path {{ projects.first.path }} --type package-tests --package-filter {{ package.name }}
+  artifacts:
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+  dependencies:
+    - .yamato/project-pack.yml#pack_{{ projects.first.name }}
+
+{% endfor -%}
+{% endfor -%}
+
+# Validation job for package {{ package.name }}, only using the first entry in the
+# platform and editor meta data
+# Validation only occurs in editmode.
+validate_{{ projects.first.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}:
+  name : Validate Project {{ projects.first.name }} - Package {{ package.name }} - {{ test_editors.first }} on {{ test_platforms.first.name }}
+  agent:
+    type: {{ test_platforms.first.type }}
+    image: {{ test_platforms.first.image }}
+    flavor: {{ test_platforms.first.flavor}}
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ test_editors.first }} --project-path {{ projects.first.path }} --type vetting-tests --package-filter {{ package.name }} --platform editmode
+  artifacts:
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+  dependencies:
+    - .yamato/project-pack.yml#pack_{{ projects.first.name }}
+{% endfor -%}
+
+# For every platform and editor version, run its project tests without
+# running package tests too since they are handled on their respective
+# jobs
+{% for project in projects -%}
+{% for editor in test_editors -%}
+{% for platform in test_platforms -%}
+test_{{ project.name }}_{{ editor }}_{{ platform.name }}:
+  name : Test Project {{ project.name }} - {{ editor }} on {{ platform.name }}
+  agent:
+    type: {{ platform.type }}
+    image: {{ platform.image }}
+    flavor: {{ platform.flavor}}
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - {% if platform.name == "centos" %}DISPLAY=:0 {% endif %}upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests
+  artifacts:
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+  dependencies:
+    - .yamato/project-pack.yml#pack_{{ project.name }}
+
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+
+# Currently, we need to have a trigger to updated badges
+# Only package badges currently exist
+badges_test_trigger:
+  name: Badges Tests Trigger
+  agent:
+    type: Unity::VM
+    image: package-ci/ubuntu:stable
+    flavor: b1.small
+  commands:
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
+    - upm-ci package izon -t
+  artifacts:
+    logs:
+      paths:
+        - "upm-ci~/test-results/**/*"
+    packages:
+      paths:
+        - "upm-ci~/packages/**/*"
+  dependencies:
+{% for project in projects -%}
+{% for package in projects.first.packages -%}
+    - .yamato/project-test.yml#validate_{{ projects.first.name }}_{{ package.name }}_{{ test_platforms.first.name }}_{{ test_editors.first }}
+{% for editor in test_editors -%}
+{% for platform in test_platforms -%}
+    - .yamato/project-test.yml#test_{{ projects.first.name }}_{{ package.name }}_{{ platform.name }}_{{ editor }}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+
+all_tests_trigger:
+  name: Repository Tests Trigger
+  dependencies:
+    # Pull in package and validate jobs through the badges job
+    - .yamato/project-test.yml#badges_test_trigger
+{% for editor in test_editors -%}
+{% for platform in test_platforms -%}
+{% for project in projects -%}
+    - .yamato/project-test.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }}
+{% endfor -%}
+{% endfor -%}
+{% endfor -%}
+
+# Run all relevant tasks when a pull request targeting the develop
+# branch is created or updated. Currently only mlapi package tests are
+# enabled, since the others are missing test coverage and will fail CI.
+develop_pull_request_trigger:
+  name: Develop Branch Triggers
+  dependencies:
+    - .yamato/project-test.yml#validate_{{ projects.first.name }}_com.unity.multiplayer.mlapi_{{ test_platforms.first.name }}_{{ test_editors.first }}
+{% for editor in test_editors -%}
+{% for platform in test_platforms -%}
+    - .yamato/project-test.yml#test_{{ projects.first.name }}_com.unity.multiplayer.mlapi_{{ platform.name }}_{{ editor }}
+{% endfor -%}
+{% endfor -%}
+  triggers:
+    cancel_old_ci: true
+    pull_requests:
+    - targets:
+        only:
+          - "master"
+          - "develop"
+          - "/release\/.*/"