Merge tag 'release/6.6.0' into openupm

Release 6.6.0
atteneder · Jun 25, 2024 · c9535b3 · c9535b3
2 parents 561c9fd + 5fef3cd
commit c9535b3
Show file tree

Hide file tree

Showing 24 changed files with 374 additions and 89 deletions.
diff --git a/.yamato/code-format-check.yml b/.yamato/code-format-check.yml
@@ -8,6 +8,8 @@ code_format_check:
     image: {{ agent.image }}
     flavor: {{ agent.flavor}}
   commands:
-    - git clone --depth 1 --branch stable https://github.cds.internal.unity3d.com/unity/unity-meta.git
+    - >
+      GIT_CLONE_PROTECTION_ACTIVE=false
+      git clone --depth 1 --branch stable https://github.cds.internal.unity3d.com/unity/unity-meta.git
     - mv unity-meta ~
     - perl ~/unity-meta/Tools/Format/format.pl --showfiles --dry-run .
diff --git a/.yamato/package-pack.yml b/.yamato/package-pack.yml
@@ -13,10 +13,10 @@ pack:
     - |
       mkdir Packages
       pushd Packages
-      git clone {% if platform.name == "win" %}"%GIT_REPOSITORY_URL%"{% else %}"$GIT_REPOSITORY_URL"{% endif %} --no-checkout gltfast
+      git clone {% if agent.os == "win" %}"%GIT_REPOSITORY_URL%"{% else %}"$GIT_REPOSITORY_URL"{% endif %} --no-checkout gltfast
       cd gltfast
-      git fetch origin {% if platform.name == "win" %}"%GIT_REVISION%"{% else %}"$GIT_REVISION"{% endif %}
-      git checkout -f --detach {% if platform.name == "win" %}"%GIT_REVISION%"{% else %}"$GIT_REVISION"{% endif %}
+      git fetch origin {% if agent.os == "win" %}"%GIT_REVISION%"{% else %}"$GIT_REVISION"{% endif %}
+      git checkout -f --detach {% if agent.os == "win" %}"%GIT_REVISION%"{% else %}"$GIT_REVISION"{% endif %}
       popd
     - npm install upm-ci-utils@stable -g --registry {{ registry.npm }}
     - upm-ci package pack --package-path Packages/gltfast

diff --git a/.yamato/package-player-test.yml b/.yamato/package-player-test.yml
@@ -36,7 +36,7 @@ build_{{ platform.name }}_{{ editor.version }}:
 
     - npm install upm-ci-utils@stable -g --registry {{ registry.npm }}
     - |
-{% if platform.windows_host -%}
+{% if agent.os == "win" -%}
       set GLTF_TEST_ASSET_DIR={{ os.yamato_source_dir }}\Assets
 {% else -%}
       export GLTF_TEST_ASSET_DIR="{{ os.yamato_source_dir }}/Assets"
@@ -89,7 +89,7 @@ run_{{ platform.name }}_{{ editor.version }}:
 {% endfor -%}
     - npm install upm-ci-utils@stable -g --registry {{ registry.npm }}
     - |
-{% if platform.name == "win" -%}
+{% if agent.os == "win" -%}
       set GLTF_TEST_ASSET_DIR={{ os.yamato_source_dir }}\Assets
 {% else -%}
       export GLTF_TEST_ASSET_DIR="{{ os.yamato_source_dir }}/Assets"
@@ -141,7 +141,7 @@ build_and_run_{{ platform.name }}_{{ editor.version }}:
 
     - npm install upm-ci-utils@stable -g --registry {{ registry.npm }}
     - |
-{% if platform.name == "win" -%}
+{% if agent.os == "win" -%}
       set GLTF_TEST_ASSET_DIR={{ os.yamato_source_dir }}\Assets
 {% else -%}
       export GLTF_TEST_ASSET_DIR="{{ os.yamato_source_dir }}/Assets"

diff --git a/.yamato/package-test.yml b/.yamato/package-test.yml
@@ -3,11 +3,11 @@
 
 {% for editor in editor_versions -%}
 {% for platform in test_platforms -%}
-{% if platform.name == "win" -%}{% assign os = os_variables.win -%}{% else -%}{% assign os = os_variables.unix -%}{% endif -%}
+{% assign agent = agents[platform.agent] -%}
+{% if agent.os == "win" -%}{% assign os = os_variables.win -%}{% else -%}{% assign os = os_variables.unix -%}{% endif -%}
 test_{{ platform.name }}_{{ editor }}:
   name : Test {{ editor }} on {{ platform.name }}
   agent:
-{% assign agent = agents[platform.agent] -%}
     type: {{ agent.type }}
     image: {{ agent.image }}
     flavor: {{ agent.flavor}}
@@ -36,9 +36,9 @@ test_{{ platform.name }}_{{ editor }}:
       popd
 {% endfor -%}
 
-    - npm install {% if platform.name == "win" %}"%UPMCI_PKG%"{% else %}"$UPMCI_PKG"{% endif %} -g --registry {{ registry.npm }}
+    - npm install {% if agent.os == "win" %}"%UPMCI_PKG%"{% else %}"$UPMCI_PKG"{% endif %} -g --registry {{ registry.npm }}
     - >
-{% if platform.name == "win" -%}
+{% if agent.os == "win" -%}
       set GLTF_TEST_ASSET_DIR={{ os.yamato_source_dir }}\Assets
 {% else -%}
       export GLTF_TEST_ASSET_DIR="{{ os.yamato_source_dir }}/Assets"
@@ -66,11 +66,11 @@ test_{{ platform.name }}_{{ editor }}:
 # Validation only occurs in editmode.
 {% for editor in editor_versions -%}
 {% for platform in test_platforms -%}
-{% if platform.name == "win" -%}{% assign os = os_variables.win -%}{% else -%}{% assign os = os_variables.unix -%}{% endif -%}
+{% assign agent = agents[platform.agent] -%}
+{% if agent.os == "win" -%}{% assign os = os_variables.win -%}{% else -%}{% assign os = os_variables.unix -%}{% endif -%}
 validate_{{ platform.name }}_{{ editor }}:
   name : Validate {{ editor }} on {{ platform.name }}
   agent:
-{% assign agent = agents[platform.agent] -%}
     type: {{ agent.type }}
     image: {{ agent.image }}
     flavor: {{ agent.flavor}}
@@ -99,9 +99,9 @@ validate_{{ platform.name }}_{{ editor }}:
       popd
 {% endfor -%}
 
-    - npm install {% if platform.name == "win" %}"%UPMCI_PKG%"{% else %}"$UPMCI_PKG"{% endif %} -g --registry {{ registry.npm }}
+    - npm install {% if agent.os == "win" %}"%UPMCI_PKG%"{% else %}"$UPMCI_PKG"{% endif %} -g --registry {{ registry.npm }}
     - >
-{% if platform.name == "win" -%}
+{% if agent.os == "win" -%}
       set GLTF_TEST_ASSET_DIR={{ os.yamato_source_dir }}\Assets
 {% else -%}
       export GLTF_TEST_ASSET_DIR="{{ os.yamato_source_dir }}/Assets"

diff --git a/.yamato/package.metafile b/.yamato/package.metafile
@@ -3,35 +3,42 @@ test_setups:
   # see GLTFast.Editor.Tests.SetupProject.ApplySetup (Tests/Editor/SetupProject.cs) for details
   - project_setup: default
     # # Use to limit versions
-    # editor_versions: [2020,2021,2022,2023.2,trunk]
+    # editor_versions: [2020,2021,2022,6000]
     # # Use to limit to platforms
     # platforms: [win,mac,ubuntu]
-    pr_sets:
+    pr_test_subset:
       - platform: win
         editor: 2020
       - platform: mac
-        editor: trunk
+        editor: 6000
       - platform: win
         editor: 2022
-    coverage_sets:
+    pr_build_subset:
+      - platform: mac
+        editor: 2022
+    coverage_subset:
       # default for coverage: windows + current LTS
       - platform: win
         editor: 2022
   - project_setup: minimalistic
-    editor_versions: [2020,2022,trunk]
+    editor_versions: [2020,2022,6000]
     platforms: [win]
-    pr_sets:
+    pr_test_subset:
       - platform: win
         editor: 2022
-    coverage_sets:
+    pr_build_subset:
+      - platform: win
+        editor: 2022
+    coverage_subset:
       # default for coverage: windows + current LTS
       - platform: win
         editor: 2022
   - project_setup: all_defines
     render_pipeline: URP-Forward
-    editor_versions: [2020,2021,2022,trunk]
+    utr_timeout: 1200
+    editor_versions: [2020,2021,2022,6000]
     platforms: [win]
-    pr_sets:
+    pr_test_subset:
       - platform: win
         editor: 2022
       # TODO: Move those to `urp` and `hdrp` test setup at some point
@@ -41,19 +48,24 @@ test_setups:
       - platform: win
         editor: 2021
       - platform: win
-        editor: trunk
-    coverage_sets:
+        editor: 6000
+    pr_build_subset:
+      - platform: win
+        editor: 6000
+    coverage_subset:
       # default for coverage: windows + current LTS
       - platform: win
         editor: 2022
   - project_setup: hdrp
     render_pipeline: HDRP-Deferred
-    editor_versions: [2022,trunk]
+    utr_timeout: 3600
+    agent_xlarge_required: !!bool true
+    editor_versions: [2022,6000]
     platforms: [win]
-    pr_sets:
+    pr_test_subset:
       - platform: win
         editor: 2022
-    coverage_sets:
+    coverage_subset:
       # default for coverage: windows + current LTS
       - platform: win
         editor: 2022
@@ -62,8 +74,8 @@ editor_versions:
   - 2020
   - 2021
   - 2022
-  - 2023.2
-  - trunk
+  - 6000
+  # - trunk
 
 platforms:
   win:
@@ -95,19 +107,17 @@ test_platforms:
 
 player_test_editors:
   - version: 2020.3
-  - version: trunk
+  - version: 6000
 
 player_test_platforms:
   - name: win
     id: standalone
-    windows_host: !!bool true
     build_and_run: win
   - name: mac
     id: standalone
     build_and_run: mac
   - name: android
     id: android
-    windows_host: !!bool true
     upm_ci_params: --backend=Il2Cpp
     build: win
     run: shield
@@ -130,41 +140,49 @@ agents:
     type: Unity::VM
     image: package-ci/win10:v4
     flavor: b1.large
+    flavor_xlarge: b1.xlarge
   mac:
     os: mac
     type: Unity::VM::osx
     image: package-ci/macos-13:v4
     flavor: m1.mac
+    flavor_xlarge: m1.mac
   ubuntu:
     os: linux
     type: Unity::VM
     image: package-ci/ubuntu-22.04:v4
     flavor: b1.large
+    flavor_xlarge: b1.xlarge
   samsung:
     os: win
     type: Unity::mobile::samsung
     image: package-ci/win10:v4
     flavor: b1.large
+    flavor_xlarge: b1.xlarge
   shield:
     os: win
     type: Unity::mobile::shield
     image: package-ci/win10:v4
     flavor: b1.large
+    flavor_xlarge: b1.xlarge
   mac-intel:
     os: mac
     type: Unity::VM::osx
     image: package-ci/macos-13:v4
     flavor: b1.large
+    flavor_xlarge: b1.xlarge
   mac-iphone:
     os: mac
     type: Unity::mobile::iPhone
     image: package-ci/macos-13:v4
     flavor: b1.large
+    flavor_xlarge: b1.xlarge
   ubuntu-small:
     os: linux
     type: Unity::VM
     image: package-ci/ubuntu-22.04:v4
     flavor: b1.small
+    flavor_xlarge: b1.xlarge
 
 test_framework: com.unity.test-framework@1.4.3