Merge branch 'main' into openupm

atteneder · Apr 22, 2024 · ef121f3 · ef121f3
2 parents 9a331fe + ffd1fa4
commit ef121f3
Show file tree

Hide file tree

Showing 61 changed files with 7,118 additions and 483 deletions.
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -29,7 +29,7 @@ comment:
   require_base: false
   require_head: false
   # Set this to the number of coverage jobs run in the PR
-  after_n_builds: 1
+  after_n_builds: 3
 
 flag_management:
   default_rules:

diff --git a/.yamato/package.metafile b/.yamato/package.metafile
@@ -1,4 +1,6 @@
 test_setups:
+  # Project profile name
+  # 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]
@@ -9,22 +11,41 @@ test_setups:
         editor: 2020
       - platform: mac
         editor: trunk
-      - platform: ubuntu
+      - platform: win
+        editor: 2022
+    coverage_sets:
+      # default for coverage: windows + current LTS
+      - platform: win
         editor: 2022
-    coverage: !!bool true
   - project_setup: minimalistic
-    editor_versions: [2020,trunk]
+    editor_versions: [2020,2022,trunk]
     platforms: [win]
     pr_sets:
       - platform: win
-        editor: trunk
+        editor: 2022
+    coverage_sets:
+      # default for coverage: windows + current LTS
+      - platform: win
+        editor: 2022
   - project_setup: all_defines
-    editor_versions: [2020,trunk]
+    render_pipeline: URP-Forward
+    editor_versions: [2020,2021,2022,trunk]
     platforms: [win]
     pr_sets:
+      - platform: win
+        editor: 2022
+      # TODO: Move those to `urp` and `hdrp` test setup at some point
+      # For URP/shader graph test all versions
+      - platform: win
+        editor: 2020
+      - platform: win
+        editor: 2021
       - platform: win
         editor: trunk
-    coverage: !!bool true
+    coverage_sets:
+      # default for coverage: windows + current LTS
+      - platform: win
+        editor: 2022
 
 editor_versions:
   - 2020
@@ -35,16 +56,27 @@ editor_versions:
 
 platforms:
   win:
-    agent: win
+    test: win
+    build_and_run: win
+    platform: StandaloneWindows64
+    component: il2cpp
   mac:
-    agent: mac
+    test: mac
+    build_and_run: mac
+    platform: StandaloneOSX
+    component: il2cpp
   ubuntu:
-    agent: ubuntu
+    test: ubuntu
+    platform: StandaloneLinux64
+    component: il2cpp
+  android:
+    build: win
+    run: samsung
+    component: Android
 
 test_platforms:
   - name: win
     agent: win
-    coverage: !!bool true
   - name: mac
     agent: mac
   - name: ubuntu
@@ -77,6 +109,9 @@ asset_sets:
   - name: glTF-test-models
     git_uri: https://github.com/atteneder/glTF-test-models.git
     git_revision: fee92e61a93546e48a34773cc8d2f20db7e22873
+  - name: glTF-Sample-Assets
+    git_uri: https://github.com/KhronosGroup/glTF-Sample-Assets.git
+    git_revision: cfbe2f9ac259490855940ff85feb5b4b02386046
 
 agents:
   win:
@@ -94,6 +129,11 @@ agents:
     type: Unity::VM
     image: package-ci/ubuntu-22.04:v4
     flavor: b1.large
+  samsung:
+    os: win
+    type: Unity::mobile::samsung
+    image: package-ci/win10:v4
+    flavor: b1.large
   shield:
     os: win
     type: Unity::mobile::shield
@@ -140,14 +180,16 @@ os_variables:
     git_url: ${GIT_REPOSITORY_URL}
     git_revision: ${GIT_REVISION}
     tool_utr: "./utr"
+    bokken_host_ip: ${BOKKEN_HOST_IP}
   # Windows specific
   win:
     yamato_source_dir: "%YAMATO_SOURCE_DIR%"
     git_url: "%GIT_REPOSITORY_URL%"
     git_revision: "%GIT_REVISION%"
     tool_utr: "utr.bat"
+    bokken_host_ip: "%BOKKEN_HOST_IP%"
 
 editor_location:
-  win: "Unity.exe"
-  mac: "Unity.app/Contents/MacOS/Unity"
-  ubuntu: "Unity"
+  win: "\\.Editor\\Unity.exe"
+  mac: "/.Editor/Unity.app/Contents/MacOS/Unity"
+  ubuntu: "/.Editor/Unity"