From 0618ad4a07edab5abff7d6f36e26e98daf3d2d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Tue, 21 Sep 2021 14:22:24 +0200 Subject: [PATCH] Remove duplicate entries --- .yamato/all-urp_2d.yml | 12 -------- .yamato/all-urp_foundation.yml | 12 -------- .yamato/all-urp_lighting.yml | 16 ---------- .yamato/all-urp_postpro.yml | 12 -------- .yamato/all-urp_terrain.yml | 16 ---------- .yamato/config/universal_2d.metafile | 18 ------------ .yamato/config/universal_foundation.metafile | 18 ------------ .yamato/config/universal_lighting.metafile | 31 +++++--------------- .yamato/config/universal_postpro.metafile | 18 ------------ .yamato/config/universal_terrain.metafile | 31 +++++--------------- 10 files changed, 14 insertions(+), 170 deletions(-) diff --git a/.yamato/all-urp_2d.yml b/.yamato/all-urp_2d.yml index bd6cb3faad9..ab97b313a21 100644 --- a/.yamato/all-urp_2d.yml +++ b/.yamato/all-urp_2d.yml @@ -38,12 +38,6 @@ PR_URP_2D_2021.2: rerun: on_new_revision - path: .yamato/urp_2d-osx-openglcore.yml#URP_2D_OSX_OpenGLCore_editmode_mono_Linear_2021.2 rerun: on_new_revision - - path: .yamato/urp_2d-android-opengles3.yml#URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-android-vulkan.yml#URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_2d-iphone-metal.yml#URP_2D_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision Extra_URP_2D_2021.2: name: Extra URP_2D on 2021.2 variables: @@ -102,12 +96,6 @@ PR_URP_2D_CUSTOM-REVISION: rerun: on_new_revision - path: .yamato/urp_2d-osx-openglcore.yml#URP_2D_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/urp_2d-android-opengles3.yml#URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/urp_2d-android-vulkan.yml#URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/urp_2d-iphone-metal.yml#URP_2D_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision Extra_URP_2D_CUSTOM-REVISION: name: Extra URP_2D on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_foundation.yml b/.yamato/all-urp_foundation.yml index d108a29e952..4bd6215c544 100644 --- a/.yamato/all-urp_foundation.yml +++ b/.yamato/all-urp_foundation.yml @@ -42,12 +42,6 @@ PR_URP_Foundation_2021.2: rerun: on_new_revision - path: .yamato/urp_foundation-osx-openglcore.yml#URP_Foundation_OSX_OpenGLCore_editmode_mono_Linear_2021.2 rerun: on_new_revision - - path: .yamato/urp_foundation-android-opengles3.yml#URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-android-vulkan.yml#URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_foundation-iphone-metal.yml#URP_Foundation_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision Extra_URP_Foundation_2021.2: name: Extra URP_Foundation on 2021.2 variables: @@ -110,12 +104,6 @@ PR_URP_Foundation_CUSTOM-REVISION: rerun: on_new_revision - path: .yamato/urp_foundation-osx-openglcore.yml#URP_Foundation_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/urp_foundation-android-opengles3.yml#URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/urp_foundation-android-vulkan.yml#URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/urp_foundation-iphone-metal.yml#URP_Foundation_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision Extra_URP_Foundation_CUSTOM-REVISION: name: Extra URP_Foundation on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_lighting.yml b/.yamato/all-urp_lighting.yml index 4259981f452..740aac9a299 100644 --- a/.yamato/all-urp_lighting.yml +++ b/.yamato/all-urp_lighting.yml @@ -36,18 +36,10 @@ PR_URP_Lighting_2021.2: rerun: on_new_revision - path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 rerun: on_new_revision - - path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - path: .yamato/urp_lighting-osx-metal.yml#URP_Lighting_OSX_Metal_playmode_mono_Linear_2021.2 rerun: on_new_revision - path: .yamato/urp_lighting-osx-openglcore.yml#URP_Lighting_OSX_OpenGLCore_editmode_mono_Linear_2021.2 rerun: on_new_revision - - path: .yamato/urp_lighting-android-opengles3.yml#URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision Extra_URP_Lighting_2021.2: name: Extra URP_Lighting on 2021.2 variables: @@ -104,18 +96,10 @@ PR_URP_Lighting_CUSTOM-REVISION: rerun: on_new_revision - path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - path: .yamato/urp_lighting-osx-metal.yml#URP_Lighting_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - path: .yamato/urp_lighting-osx-openglcore.yml#URP_Lighting_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/urp_lighting-android-opengles3.yml#URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/urp_lighting-android-vulkan.yml#URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/urp_lighting-iphone-metal.yml#URP_Lighting_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision Extra_URP_Lighting_CUSTOM-REVISION: name: Extra URP_Lighting on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_postpro.yml b/.yamato/all-urp_postpro.yml index 2b060592877..ff61a980706 100644 --- a/.yamato/all-urp_postpro.yml +++ b/.yamato/all-urp_postpro.yml @@ -42,12 +42,6 @@ PR_URP_PostPro_2021.2: rerun: on_new_revision - path: .yamato/urp_postpro-osx-openglcore.yml#URP_PostPro_OSX_OpenGLCore_editmode_mono_Linear_2021.2 rerun: on_new_revision - - path: .yamato/urp_postpro-android-opengles3.yml#URP_PostPro_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-android-vulkan.yml#URP_PostPro_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_postpro-iphone-metal.yml#URP_PostPro_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision Extra_URP_PostPro_2021.2: name: Extra URP_PostPro on 2021.2 variables: @@ -110,12 +104,6 @@ PR_URP_PostPro_CUSTOM-REVISION: rerun: on_new_revision - path: .yamato/urp_postpro-osx-openglcore.yml#URP_PostPro_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/urp_postpro-android-opengles3.yml#URP_PostPro_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/urp_postpro-android-vulkan.yml#URP_PostPro_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/urp_postpro-iphone-metal.yml#URP_PostPro_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision Extra_URP_PostPro_CUSTOM-REVISION: name: Extra URP_PostPro on CUSTOM-REVISION variables: diff --git a/.yamato/all-urp_terrain.yml b/.yamato/all-urp_terrain.yml index 76da7109cce..088a27dd681 100644 --- a/.yamato/all-urp_terrain.yml +++ b/.yamato/all-urp_terrain.yml @@ -36,18 +36,10 @@ PR_URP_Terrain_2021.2: rerun: on_new_revision - path: .yamato/urp_terrain-android-vulkan.yml#URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 rerun: on_new_revision - - path: .yamato/urp_terrain-iphone-metal.yml#URP_Terrain_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - path: .yamato/urp_terrain-osx-metal.yml#URP_Terrain_OSX_Metal_playmode_mono_Linear_2021.2 rerun: on_new_revision - path: .yamato/urp_terrain-osx-openglcore.yml#URP_Terrain_OSX_OpenGLCore_editmode_mono_Linear_2021.2 rerun: on_new_revision - - path: .yamato/urp_terrain-android-opengles3.yml#URP_Terrain_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-android-vulkan.yml#URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision - - path: .yamato/urp_terrain-iphone-metal.yml#URP_Terrain_iPhone_Metal_Standalone_il2cpp_Linear_2021.2 - rerun: on_new_revision Extra_URP_Terrain_2021.2: name: Extra URP_Terrain on 2021.2 variables: @@ -104,18 +96,10 @@ PR_URP_Terrain_CUSTOM-REVISION: rerun: on_new_revision - path: .yamato/urp_terrain-android-vulkan.yml#URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/urp_terrain-iphone-metal.yml#URP_Terrain_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - path: .yamato/urp_terrain-osx-metal.yml#URP_Terrain_OSX_Metal_playmode_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - path: .yamato/urp_terrain-osx-openglcore.yml#URP_Terrain_OSX_OpenGLCore_editmode_mono_Linear_CUSTOM-REVISION rerun: on_new_revision - - path: .yamato/urp_terrain-android-opengles3.yml#URP_Terrain_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/urp_terrain-android-vulkan.yml#URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision - - path: .yamato/urp_terrain-iphone-metal.yml#URP_Terrain_iPhone_Metal_Standalone_il2cpp_Linear_CUSTOM-REVISION - rerun: on_new_revision Extra_URP_Terrain_CUSTOM-REVISION: name: Extra URP_Terrain on CUSTOM-REVISION variables: diff --git a/.yamato/config/universal_2d.metafile b/.yamato/config/universal_2d.metafile index 198e078c7ec..666b3437a72 100644 --- a/.yamato/config/universal_2d.metafile +++ b/.yamato/config/universal_2d.metafile @@ -190,24 +190,6 @@ jobs: color_space: Linear test_platforms: - editmode - - platform: Android - api: OpenGLES3 - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - platform: Android - api: Vulkan - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - platform: iPhone - api: Metal - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - name: Extra dependencies: diff --git a/.yamato/config/universal_foundation.metafile b/.yamato/config/universal_foundation.metafile index deafd1d30b1..34e806a627f 100644 --- a/.yamato/config/universal_foundation.metafile +++ b/.yamato/config/universal_foundation.metafile @@ -220,24 +220,6 @@ jobs: color_space: Linear test_platforms: - editmode - - platform: Android - api: OpenGLES3 - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - platform: Android - api: Vulkan - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - platform: iPhone - api: Metal - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - name: Extra dependencies: diff --git a/.yamato/config/universal_lighting.metafile b/.yamato/config/universal_lighting.metafile index 4d053e944d2..b28847641da 100644 --- a/.yamato/config/universal_lighting.metafile +++ b/.yamato/config/universal_lighting.metafile @@ -198,12 +198,6 @@ jobs: color_space: Linear test_platforms: - Standalone - - platform: iPhone - api: Metal - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - platform: OSX api: Metal build_config: mono @@ -217,24 +211,13 @@ jobs: color_space: Linear test_platforms: - editmode - - platform: Android - api: OpenGLES3 - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - platform: Android - api: Vulkan - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - platform: iPhone - api: Metal - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone + # Disabled until https://fogbugz.unity3d.com/f/cases/1309660/ is fixed. + # - platform: iPhone + # api: Metal + # build_config: il2cpp + # color_space: Linear + # test_platforms: + # - Standalone - name: Extra dependencies: diff --git a/.yamato/config/universal_postpro.metafile b/.yamato/config/universal_postpro.metafile index 819539007df..5f68879cd0b 100644 --- a/.yamato/config/universal_postpro.metafile +++ b/.yamato/config/universal_postpro.metafile @@ -214,24 +214,6 @@ jobs: color_space: Linear test_platforms: - editmode - - platform: Android - api: OpenGLES3 - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - platform: Android - api: Vulkan - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - platform: iPhone - api: Metal - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - name: Extra dependencies: diff --git a/.yamato/config/universal_terrain.metafile b/.yamato/config/universal_terrain.metafile index a04df678fdf..96e21a5462a 100644 --- a/.yamato/config/universal_terrain.metafile +++ b/.yamato/config/universal_terrain.metafile @@ -195,12 +195,6 @@ jobs: color_space: Linear test_platforms: - Standalone - - platform: iPhone - api: Metal - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - platform: OSX api: Metal build_config: mono @@ -214,24 +208,13 @@ jobs: color_space: Linear test_platforms: - editmode - - platform: Android - api: OpenGLES3 - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - platform: Android - api: Vulkan - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone - - platform: iPhone - api: Metal - build_config: il2cpp - color_space: Linear - test_platforms: - - Standalone + # Disabled until https://fogbugz.unity3d.com/f/cases/1309660/ is fixed. + # - platform: iPhone + # api: Metal + # build_config: il2cpp + # color_space: Linear + # test_platforms: + # - Standalone - name: Extra dependencies: