From cd81dfcf4f3b7e62d258ca3d093c64d90414754d Mon Sep 17 00:00:00 2001 From: Sebastien Lagarde Date: Sat, 28 Mar 2020 15:22:28 +0100 Subject: [PATCH 1/5] move test folder --- .../{Assets => Packages/com.unity.template.hd}/Tests/Editor.meta | 0 .../com.unity.template.hd}/Tests/Editor/InternalTests.meta | 0 .../Tests/Editor/InternalTests/ExpectedSettings.cs | 0 .../Tests/Editor/InternalTests/ExpectedSettings.cs.meta | 0 .../Tests/Editor/InternalTests/InternalTests.asmdef | 0 .../Tests/Editor/InternalTests/InternalTests.asmdef.meta | 0 .../com.unity.template.universal}/Tests/Editor.meta | 0 .../Tests/Editor/EditorExampleTest.cs | 0 .../Tests/Editor/EditorExampleTest.cs.meta | 0 .../com.unity.template.universal}/Tests/Editor/EditorTests.asmdef | 0 .../Tests/Editor/EditorTests.asmdef.meta | 0 .../com.unity.template.universal}/Tests/Editor/InternalTests.meta | 0 .../Tests/Editor/InternalTests/ExpectedSettings.cs | 0 .../Tests/Editor/InternalTests/ExpectedSettings.cs.meta | 0 .../Tests/Editor/InternalTests/InternalTests.asmdef | 0 .../Tests/Editor/InternalTests/InternalTests.asmdef.meta | 0 .../com.unity.template.universal}/Tests/Runtime.meta | 0 .../Tests/Runtime/RuntimeExampleTest.cs | 0 .../Tests/Runtime/RuntimeExampleTest.cs.meta | 0 .../Tests/Runtime/RuntimeTests.asmdef | 0 .../Tests/Runtime/RuntimeTests.asmdef.meta | 0 21 files changed, 0 insertions(+), 0 deletions(-) rename com.unity.template-hd/{Assets => Packages/com.unity.template.hd}/Tests/Editor.meta (100%) rename com.unity.template-hd/{Assets => Packages/com.unity.template.hd}/Tests/Editor/InternalTests.meta (100%) rename com.unity.template-hd/{Assets => Packages/com.unity.template.hd}/Tests/Editor/InternalTests/ExpectedSettings.cs (100%) rename com.unity.template-hd/{Assets => Packages/com.unity.template.hd}/Tests/Editor/InternalTests/ExpectedSettings.cs.meta (100%) rename com.unity.template-hd/{Assets => Packages/com.unity.template.hd}/Tests/Editor/InternalTests/InternalTests.asmdef (100%) rename com.unity.template-hd/{Assets => Packages/com.unity.template.hd}/Tests/Editor/InternalTests/InternalTests.asmdef.meta (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Editor.meta (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Editor/EditorExampleTest.cs (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Editor/EditorExampleTest.cs.meta (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Editor/EditorTests.asmdef (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Editor/EditorTests.asmdef.meta (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Editor/InternalTests.meta (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Editor/InternalTests/ExpectedSettings.cs (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Editor/InternalTests/ExpectedSettings.cs.meta (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Editor/InternalTests/InternalTests.asmdef (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Editor/InternalTests/InternalTests.asmdef.meta (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Runtime.meta (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Runtime/RuntimeExampleTest.cs (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Runtime/RuntimeExampleTest.cs.meta (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Runtime/RuntimeTests.asmdef (100%) rename com.unity.template-universal/{Assets => Packages/com.unity.template.universal}/Tests/Runtime/RuntimeTests.asmdef.meta (100%) diff --git a/com.unity.template-hd/Assets/Tests/Editor.meta b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor.meta similarity index 100% rename from com.unity.template-hd/Assets/Tests/Editor.meta rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor.meta diff --git a/com.unity.template-hd/Assets/Tests/Editor/InternalTests.meta b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests.meta similarity index 100% rename from com.unity.template-hd/Assets/Tests/Editor/InternalTests.meta rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests.meta diff --git a/com.unity.template-hd/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/ExpectedSettings.cs similarity index 100% rename from com.unity.template-hd/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/ExpectedSettings.cs diff --git a/com.unity.template-hd/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs.meta b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/ExpectedSettings.cs.meta similarity index 100% rename from com.unity.template-hd/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs.meta rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/ExpectedSettings.cs.meta diff --git a/com.unity.template-hd/Assets/Tests/Editor/InternalTests/InternalTests.asmdef b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/InternalTests.asmdef similarity index 100% rename from com.unity.template-hd/Assets/Tests/Editor/InternalTests/InternalTests.asmdef rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/InternalTests.asmdef diff --git a/com.unity.template-hd/Assets/Tests/Editor/InternalTests/InternalTests.asmdef.meta b/com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/InternalTests.asmdef.meta similarity index 100% rename from com.unity.template-hd/Assets/Tests/Editor/InternalTests/InternalTests.asmdef.meta rename to com.unity.template-hd/Packages/com.unity.template.hd/Tests/Editor/InternalTests/InternalTests.asmdef.meta diff --git a/com.unity.template-universal/Assets/Tests/Editor.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor.meta similarity index 100% rename from com.unity.template-universal/Assets/Tests/Editor.meta rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor.meta diff --git a/com.unity.template-universal/Assets/Tests/Editor/EditorExampleTest.cs b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorExampleTest.cs similarity index 100% rename from com.unity.template-universal/Assets/Tests/Editor/EditorExampleTest.cs rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorExampleTest.cs diff --git a/com.unity.template-universal/Assets/Tests/Editor/EditorExampleTest.cs.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorExampleTest.cs.meta similarity index 100% rename from com.unity.template-universal/Assets/Tests/Editor/EditorExampleTest.cs.meta rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorExampleTest.cs.meta diff --git a/com.unity.template-universal/Assets/Tests/Editor/EditorTests.asmdef b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorTests.asmdef similarity index 100% rename from com.unity.template-universal/Assets/Tests/Editor/EditorTests.asmdef rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorTests.asmdef diff --git a/com.unity.template-universal/Assets/Tests/Editor/EditorTests.asmdef.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorTests.asmdef.meta similarity index 100% rename from com.unity.template-universal/Assets/Tests/Editor/EditorTests.asmdef.meta rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/EditorTests.asmdef.meta diff --git a/com.unity.template-universal/Assets/Tests/Editor/InternalTests.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests.meta similarity index 100% rename from com.unity.template-universal/Assets/Tests/Editor/InternalTests.meta rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests.meta diff --git a/com.unity.template-universal/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs similarity index 100% rename from com.unity.template-universal/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs diff --git a/com.unity.template-universal/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs.meta similarity index 100% rename from com.unity.template-universal/Assets/Tests/Editor/InternalTests/ExpectedSettings.cs.meta rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/ExpectedSettings.cs.meta diff --git a/com.unity.template-universal/Assets/Tests/Editor/InternalTests/InternalTests.asmdef b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/InternalTests.asmdef similarity index 100% rename from com.unity.template-universal/Assets/Tests/Editor/InternalTests/InternalTests.asmdef rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/InternalTests.asmdef diff --git a/com.unity.template-universal/Assets/Tests/Editor/InternalTests/InternalTests.asmdef.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/InternalTests.asmdef.meta similarity index 100% rename from com.unity.template-universal/Assets/Tests/Editor/InternalTests/InternalTests.asmdef.meta rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Editor/InternalTests/InternalTests.asmdef.meta diff --git a/com.unity.template-universal/Assets/Tests/Runtime.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime.meta similarity index 100% rename from com.unity.template-universal/Assets/Tests/Runtime.meta rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime.meta diff --git a/com.unity.template-universal/Assets/Tests/Runtime/RuntimeExampleTest.cs b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeExampleTest.cs similarity index 100% rename from com.unity.template-universal/Assets/Tests/Runtime/RuntimeExampleTest.cs rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeExampleTest.cs diff --git a/com.unity.template-universal/Assets/Tests/Runtime/RuntimeExampleTest.cs.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeExampleTest.cs.meta similarity index 100% rename from com.unity.template-universal/Assets/Tests/Runtime/RuntimeExampleTest.cs.meta rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeExampleTest.cs.meta diff --git a/com.unity.template-universal/Assets/Tests/Runtime/RuntimeTests.asmdef b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeTests.asmdef similarity index 100% rename from com.unity.template-universal/Assets/Tests/Runtime/RuntimeTests.asmdef rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeTests.asmdef diff --git a/com.unity.template-universal/Assets/Tests/Runtime/RuntimeTests.asmdef.meta b/com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeTests.asmdef.meta similarity index 100% rename from com.unity.template-universal/Assets/Tests/Runtime/RuntimeTests.asmdef.meta rename to com.unity.template-universal/Packages/com.unity.template.universal/Tests/Runtime/RuntimeTests.asmdef.meta From ab57f2e26135ecc9ab15750b0392e56beca5eb17 Mon Sep 17 00:00:00 2001 From: sebastienlagarde Date: Sat, 28 Mar 2020 17:49:57 +0100 Subject: [PATCH 2/5] Update upm-ci-templates.yml --- .yamato/upm-ci-templates.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.yamato/upm-ci-templates.yml b/.yamato/upm-ci-templates.yml index 5bcb5fdaeeb..1d15f56d18c 100644 --- a/.yamato/upm-ci-templates.yml +++ b/.yamato/upm-ci-templates.yml @@ -142,4 +142,8 @@ all_template_ci_{{ editor.version }}: - .yamato/upm-ci-templates.yml#test_{{ template.id}}_{{ platform.name }}_{{ editor.version }}_dependencies {% endfor %} {% endfor %} + artifacts: + packages: + paths: + - "upm-ci~/packages/**/*" {% endfor %} \ No newline at end of file From cdb3bd571789a9bc379fb0b66ec81fba3c9f4568 Mon Sep 17 00:00:00 2001 From: sebastienlagarde Date: Sat, 28 Mar 2020 17:50:48 +0100 Subject: [PATCH 3/5] Update upm-ci-templates.yml --- .yamato/upm-ci-templates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci-templates.yml b/.yamato/upm-ci-templates.yml index 1d15f56d18c..1b8f9f6c12a 100644 --- a/.yamato/upm-ci-templates.yml +++ b/.yamato/upm-ci-templates.yml @@ -142,7 +142,7 @@ all_template_ci_{{ editor.version }}: - .yamato/upm-ci-templates.yml#test_{{ template.id}}_{{ platform.name }}_{{ editor.version }}_dependencies {% endfor %} {% endfor %} - artifacts: + artifacts: packages: paths: - "upm-ci~/packages/**/*" From b6b1688aa9203bd9932879afde231c2fe9f8d2dc Mon Sep 17 00:00:00 2001 From: sebastienlagarde Date: Sat, 28 Mar 2020 20:42:59 +0100 Subject: [PATCH 4/5] Revert "Update upm-ci-templates.yml" This reverts commit f4baa2d5cff7d2b727bb5e26350ba0fc170e2ed2. --- .yamato/upm-ci-templates.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/upm-ci-templates.yml b/.yamato/upm-ci-templates.yml index 1b8f9f6c12a..1d15f56d18c 100644 --- a/.yamato/upm-ci-templates.yml +++ b/.yamato/upm-ci-templates.yml @@ -142,7 +142,7 @@ all_template_ci_{{ editor.version }}: - .yamato/upm-ci-templates.yml#test_{{ template.id}}_{{ platform.name }}_{{ editor.version }}_dependencies {% endfor %} {% endfor %} - artifacts: + artifacts: packages: paths: - "upm-ci~/packages/**/*" From bf3de652d51675b26a13ebfdfd533ed0394491f3 Mon Sep 17 00:00:00 2001 From: sebastienlagarde Date: Sat, 28 Mar 2020 20:43:03 +0100 Subject: [PATCH 5/5] Revert "Update upm-ci-templates.yml" This reverts commit 4590964e4f4aa147ec571cf5b72c656df09c8b03. --- .yamato/upm-ci-templates.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.yamato/upm-ci-templates.yml b/.yamato/upm-ci-templates.yml index 1d15f56d18c..5bcb5fdaeeb 100644 --- a/.yamato/upm-ci-templates.yml +++ b/.yamato/upm-ci-templates.yml @@ -142,8 +142,4 @@ all_template_ci_{{ editor.version }}: - .yamato/upm-ci-templates.yml#test_{{ template.id}}_{{ platform.name }}_{{ editor.version }}_dependencies {% endfor %} {% endfor %} - artifacts: - packages: - paths: - - "upm-ci~/packages/**/*" {% endfor %} \ No newline at end of file