From ad9de87d845cbc76a56ebae2ce67203184790fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Tue, 30 Nov 2021 11:07:51 +0100 Subject: [PATCH 1/2] Backport #6417 --- Tools/.pre-commit-config.yaml | 2 +- Tools/readme.md | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Tools/.pre-commit-config.yaml b/Tools/.pre-commit-config.yaml index e8f7b3a8105..a7ada0ce078 100644 --- a/Tools/.pre-commit-config.yaml +++ b/Tools/.pre-commit-config.yaml @@ -1,7 +1,7 @@ default_stages: [commit] repos: - repo: git@github.cds.internal.unity3d.com:unity/gfx-sdet-tools.git - rev: 14104d8 + rev: 067ebc2bc1765008be989564cab8d80a095b8fef hooks: - id: file-extension-to-lowercase - id: check-shader-includes diff --git a/Tools/readme.md b/Tools/readme.md index cad1c7a9db6..c73d906bdbd 100644 --- a/Tools/readme.md +++ b/Tools/readme.md @@ -27,13 +27,15 @@ Follow these steps to install the git hooks before working on the Graphics repos 1. Install [Python >= 3.6](https://www.python.org/downloads/) and make sure it is accessible in your PATH. 2. Install [pip3](https://pip.pypa.io/en/stable/installing/). -3. Make sure [unity-meta](https://internaldocs.hq.unity3d.com/unity-meta/setup/) is installed and its requirements are fulfilled. It will be used by the format code hook to ensure your code complies with the convention. _Sidenote: it is the same tool used to format C++/trunk code._ +3. Make sure [unity-meta](https://internaldocs.hq.unity3d.com/unity-meta/setup/) is installed and its requirements are fulfilled. It will be used by the format code hook to ensure your code complies with the convention. + - _Sidenote: it is the same tool used to format C++/trunk code._ + - _Sidenote 2: Nowadays unity-meta can be installed using git only, no need to use the mercurial clone anymore. The git repository can be found [here](https://github.cds.internal.unity3d.com/unity/unity-meta)._ 4. Make sure you have access to the cds.github.com repositories. Usually this means following [these steps](https://docs.github.com/en/enterprise-server@2.21/github/authenticating-to-github/connecting-to-github-with-ssh) to create and upload an ssh key to [cds.github.com](https://github.cds.internal.unity3d.com/settings/keys). 5. From the root of the repository, run `cd Tools` and `python3 ./hooks_setup.py`. ### Available hooks -A description of the hooks we currently have is available in the [hooks library repository](https://github.cds.internal.unity3d.com/theo-penavaire/gfx-automation-tools#available-git-hooks). +A description of the hooks we currently have is available in the [hooks library repository](https://github.cds.internal.unity3d.com/unity/gfx-sdet-tools/blob/master/hooks/readme.md). For this repository we have enabled: @@ -68,8 +70,6 @@ git commit -m "test" // Do a reset to undo our test: git reset --soft HEAD~1 (This "undoes" the last commit and keep the committed files in your staging area so delete test.txt after) ``` - - **Permission denied (SSH) when installing the git hooks** Please, follow these steps: https://docs.github.com/en/enterprise-server@2.21/github/authenticating-to-github/connecting-to-github-with-ssh. Do not forget the ssh agent step. @@ -83,8 +83,6 @@ Look for a line starting by “Offering public key...”. It will tell you which Last resort: [Troubleshooting SSH section in Github docs](https://docs.github.com/en/enterprise-server@2.21/github/authenticating-to-github/troubleshooting-ssh). - - **Python or pre-commit not found, even if python is installed, "/usr/bin/env: ‘python’: Permission denied"** Make sure Python (>=3.6) is in your PATH. Commands that can help: @@ -99,7 +97,6 @@ If python can't find the `pre-commit` package, make sure the Scripts folder outp A clean reinstall of Python solves most issues. Make sure to rerun the `hooks_setup.py` script after you reinstall Python. - **Python was not found; run without arguments to install from the Microsoft Store, or disable this shortcut from Settings > Manage App Execution Aliases.** Run `python` instead of `python3`. @@ -114,20 +111,22 @@ Follow the suggestions of [this StackOverflow answer](https://stackoverflow.com/ On Windows, Active perl is not supported by the formatting tool. Use Strawberry perl. +**ValueError: '.git' is not in list when running python .\hooks_setup.py** +Your git version is probably outdated. You can check that `git --version` returns a fairly recent version of it. You may have several versions of git on your machine, and the default one is outdated, in which case you'll need to add the path to the most recent one to your PATH variable (add it at the top or beginning of the list so that it takes precedence over any other git version installed on your system). + ## Formatting Provided you installed [unity-meta](https://internaldocs.hq.unity3d.com/unity-meta/setup/), you can manually run the formatting tool with the following command: ``` -perl ~/unity-meta/Tools/Format/format.pl --hgroot $(pwd) --dry-run +perl ~/unity-meta/Tools/Format/format.pl --dry-run ``` **Notes for Windows users:** -- Use Powershell (not the CMD), or the command substitution syntax `$(pwd)` won't be recognized. Alternatively, you can replace `$(pwd)` by the full path to your repository root (ie. where you are in the file system now). - Uou may have to manually "expand" the tilde (`~`) sign, meaning replacing it by your $HOME path. In powershell, hit `TAB` with the cursor on the tilde sign to automatically expand it to the $HOME path. - You may have to run `perl.exe` instead of `perl`. To actually apply the changes: ``` -perl ~/unity-meta/Tools/Format/format.pl --hgroot $(pwd) --nobackups +perl ~/unity-meta/Tools/Format/format.pl --nobackups ``` Use `--help` to discover more useful options (`--preview` will generate a diff file for instance) From 3fb4b67d8b811d550acbcdc8c540bed5a3a6221b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Tue, 30 Nov 2021 11:08:31 +0100 Subject: [PATCH 2/2] Backport #6408 --- .yamato/config/__shared.metafile | 2 +- .yamato/shadergraph-android-opengles3.yml | 4 ++-- .yamato/shadergraph-android-vulkan.yml | 4 ++-- .yamato/universal_hybrid-android-opengles3.yml | 4 ++-- .yamato/universal_hybrid-android-vulkan.yml | 4 ++-- .yamato/urp_2d-android-opengles3.yml | 4 ++-- .yamato/urp_2d-android-vulkan.yml | 4 ++-- .yamato/urp_foundation-android-opengles3.yml | 8 ++++---- .yamato/urp_foundation-android-vulkan.yml | 8 ++++---- .yamato/urp_lighting-android-opengles3.yml | 8 ++++---- .yamato/urp_lighting-android-vulkan.yml | 8 ++++---- .yamato/urp_postpro-android-opengles3.yml | 8 ++++---- .yamato/urp_postpro-android-vulkan.yml | 8 ++++---- .yamato/urp_terrain-android-opengles3.yml | 8 ++++---- .yamato/urp_terrain-android-vulkan.yml | 8 ++++---- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.yamato/config/__shared.metafile b/.yamato/config/__shared.metafile index bfd46acd5da..f1efa380849 100644 --- a/.yamato/config/__shared.metafile +++ b/.yamato/config/__shared.metafile @@ -397,7 +397,7 @@ platforms: agents_project: default: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large standalone_build: diff --git a/.yamato/shadergraph-android-opengles3.yml b/.yamato/shadergraph-android-opengles3.yml index 3512b8106c7..b2e2839ca05 100644 --- a/.yamato/shadergraph-android-opengles3.yml +++ b/.yamato/shadergraph-android-opengles3.yml @@ -11,7 +11,7 @@ ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2: name: ShaderGraph on Android_OpenGLES3_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ ShaderGraph_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: ShaderGraph on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/shadergraph-android-vulkan.yml b/.yamato/shadergraph-android-vulkan.yml index 9e606cd9c7a..348afb3743f 100644 --- a/.yamato/shadergraph-android-vulkan.yml +++ b/.yamato/shadergraph-android-vulkan.yml @@ -11,7 +11,7 @@ ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_2021.2: name: ShaderGraph on Android_Vulkan_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ ShaderGraph_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: ShaderGraph on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/universal_hybrid-android-opengles3.yml b/.yamato/universal_hybrid-android-opengles3.yml index eeb6efb8782..44876e3d424 100644 --- a/.yamato/universal_hybrid-android-opengles3.yml +++ b/.yamato/universal_hybrid-android-opengles3.yml @@ -11,7 +11,7 @@ Universal_Hybrid_Android_OpenGLES3_Standalone_mono_Linear_2021.2: name: Universal_Hybrid on Android_OpenGLES3_Standalone_mono_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ Universal_Hybrid_Android_OpenGLES3_Standalone_mono_Linear_CUSTOM-REVISION: name: Universal_Hybrid on Android_OpenGLES3_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/universal_hybrid-android-vulkan.yml b/.yamato/universal_hybrid-android-vulkan.yml index 556cc3184b8..1155ed06bd0 100644 --- a/.yamato/universal_hybrid-android-vulkan.yml +++ b/.yamato/universal_hybrid-android-vulkan.yml @@ -11,7 +11,7 @@ Universal_Hybrid_Android_Vulkan_Standalone_mono_Linear_2021.2: name: Universal_Hybrid on Android_Vulkan_Standalone_mono_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ Universal_Hybrid_Android_Vulkan_Standalone_mono_Linear_CUSTOM-REVISION: name: Universal_Hybrid on Android_Vulkan_Standalone_mono_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/urp_2d-android-opengles3.yml b/.yamato/urp_2d-android-opengles3.yml index 5feed12743e..010214cf16e 100644 --- a/.yamato/urp_2d-android-opengles3.yml +++ b/.yamato/urp_2d-android-opengles3.yml @@ -11,7 +11,7 @@ URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2: name: URP_2D on Android_OpenGLES3_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ URP_2D_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: URP_2D on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/urp_2d-android-vulkan.yml b/.yamato/urp_2d-android-vulkan.yml index 38830179b41..ebb1f90304b 100644 --- a/.yamato/urp_2d-android-vulkan.yml +++ b/.yamato/urp_2d-android-vulkan.yml @@ -11,7 +11,7 @@ URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_2021.2: name: URP_2D on Android_Vulkan_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ URP_2D_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: URP_2D on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/urp_foundation-android-opengles3.yml b/.yamato/urp_foundation-android-opengles3.yml index dac23a56b20..faa2e5aa367 100644 --- a/.yamato/urp_foundation-android-opengles3.yml +++ b/.yamato/urp_foundation-android-opengles3.yml @@ -11,7 +11,7 @@ URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2: name: URP_Foundation on Android_OpenGLES3_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ URP_Foundation_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_2021.2: name: URP_Foundation on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -165,7 +165,7 @@ URP_Foundation_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: URP_Foundation on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -242,7 +242,7 @@ URP_Foundation_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION: name: URP_Foundation on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/urp_foundation-android-vulkan.yml b/.yamato/urp_foundation-android-vulkan.yml index a6c964b6a76..79072d7ce52 100644 --- a/.yamato/urp_foundation-android-vulkan.yml +++ b/.yamato/urp_foundation-android-vulkan.yml @@ -11,7 +11,7 @@ URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_2021.2: name: URP_Foundation on Android_Vulkan_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ URP_Foundation_Android_Vulkan_Standalone_XR_il2cpp_Linear_2021.2: name: URP_Foundation on Android_Vulkan_Standalone_XR_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -165,7 +165,7 @@ URP_Foundation_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: URP_Foundation on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -242,7 +242,7 @@ URP_Foundation_Android_Vulkan_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION: name: URP_Foundation on Android_Vulkan_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/urp_lighting-android-opengles3.yml b/.yamato/urp_lighting-android-opengles3.yml index 8a9f4e32f93..937fbdc6b62 100644 --- a/.yamato/urp_lighting-android-opengles3.yml +++ b/.yamato/urp_lighting-android-opengles3.yml @@ -11,7 +11,7 @@ URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2: name: URP_Lighting on Android_OpenGLES3_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ URP_Lighting_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_2021.2: name: URP_Lighting on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -165,7 +165,7 @@ URP_Lighting_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: URP_Lighting on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -242,7 +242,7 @@ URP_Lighting_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION: name: URP_Lighting on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/urp_lighting-android-vulkan.yml b/.yamato/urp_lighting-android-vulkan.yml index d33209fc42f..f0d737bc711 100644 --- a/.yamato/urp_lighting-android-vulkan.yml +++ b/.yamato/urp_lighting-android-vulkan.yml @@ -11,7 +11,7 @@ URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_2021.2: name: URP_Lighting on Android_Vulkan_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ URP_Lighting_Android_Vulkan_Standalone_XR_il2cpp_Linear_2021.2: name: URP_Lighting on Android_Vulkan_Standalone_XR_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -165,7 +165,7 @@ URP_Lighting_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: URP_Lighting on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -242,7 +242,7 @@ URP_Lighting_Android_Vulkan_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION: name: URP_Lighting on Android_Vulkan_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/urp_postpro-android-opengles3.yml b/.yamato/urp_postpro-android-opengles3.yml index d0c54af35b7..f5f22b7dd77 100644 --- a/.yamato/urp_postpro-android-opengles3.yml +++ b/.yamato/urp_postpro-android-opengles3.yml @@ -11,7 +11,7 @@ URP_PostPro_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2: name: URP_PostPro on Android_OpenGLES3_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ URP_PostPro_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_2021.2: name: URP_PostPro on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -165,7 +165,7 @@ URP_PostPro_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: URP_PostPro on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -242,7 +242,7 @@ URP_PostPro_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION: name: URP_PostPro on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/urp_postpro-android-vulkan.yml b/.yamato/urp_postpro-android-vulkan.yml index a55c63f9b47..62e421135b6 100644 --- a/.yamato/urp_postpro-android-vulkan.yml +++ b/.yamato/urp_postpro-android-vulkan.yml @@ -11,7 +11,7 @@ URP_PostPro_Android_Vulkan_Standalone_il2cpp_Linear_2021.2: name: URP_PostPro on Android_Vulkan_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ URP_PostPro_Android_Vulkan_Standalone_XR_il2cpp_Linear_2021.2: name: URP_PostPro on Android_Vulkan_Standalone_XR_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -165,7 +165,7 @@ URP_PostPro_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: URP_PostPro on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -242,7 +242,7 @@ URP_PostPro_Android_Vulkan_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION: name: URP_PostPro on Android_Vulkan_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/urp_terrain-android-opengles3.yml b/.yamato/urp_terrain-android-opengles3.yml index f7b3978eadd..1246f13799b 100644 --- a/.yamato/urp_terrain-android-opengles3.yml +++ b/.yamato/urp_terrain-android-opengles3.yml @@ -11,7 +11,7 @@ URP_Terrain_Android_OpenGLES3_Standalone_il2cpp_Linear_2021.2: name: URP_Terrain on Android_OpenGLES3_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ URP_Terrain_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_2021.2: name: URP_Terrain on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -165,7 +165,7 @@ URP_Terrain_Android_OpenGLES3_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: URP_Terrain on Android_OpenGLES3_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -242,7 +242,7 @@ URP_Terrain_Android_OpenGLES3_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION: name: URP_Terrain on Android_OpenGLES3_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: diff --git a/.yamato/urp_terrain-android-vulkan.yml b/.yamato/urp_terrain-android-vulkan.yml index e070a874862..778c29ee553 100644 --- a/.yamato/urp_terrain-android-vulkan.yml +++ b/.yamato/urp_terrain-android-vulkan.yml @@ -11,7 +11,7 @@ URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_2021.2: name: URP_Terrain on Android_Vulkan_Standalone_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -88,7 +88,7 @@ URP_Terrain_Android_Vulkan_Standalone_XR_il2cpp_Linear_2021.2: name: URP_Terrain on Android_Vulkan_Standalone_XR_il2cpp_Linear on version 2021.2 agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -165,7 +165,7 @@ URP_Terrain_Android_Vulkan_Standalone_il2cpp_Linear_CUSTOM-REVISION: name: URP_Terrain on Android_Vulkan_Standalone_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: @@ -242,7 +242,7 @@ URP_Terrain_Android_Vulkan_Standalone_XR_il2cpp_Linear_CUSTOM-REVISION: name: URP_Terrain on Android_Vulkan_Standalone_XR_il2cpp_Linear on version CUSTOM-REVISION agent: type: Unity::mobile::samsung - model: s10e-eu + model: s21-eu image: mobile/android-execution-r19:stable flavor: b1.large variables: