diff --git a/.yamato/_templates.yml b/.yamato/_templates.yml index 23baca71867..fb62176d715 100644 --- a/.yamato/_templates.yml +++ b/.yamato/_templates.yml @@ -38,8 +38,6 @@ pack_hdrp_template_Win_trunk: commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template pack --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#pre_pack_hdrp_template_Win_trunk artifacts: packages: paths: @@ -92,8 +90,6 @@ pack_hdrp_template_OSX_trunk: commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template pack --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#pre_pack_hdrp_template_OSX_trunk artifacts: packages: paths: @@ -184,8 +180,6 @@ pack_hdrp_template_Win_CUSTOM-REVISION: commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template pack --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#pre_pack_hdrp_template_Win_CUSTOM-REVISION artifacts: packages: paths: @@ -238,8 +232,6 @@ pack_hdrp_template_OSX_CUSTOM-REVISION: commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template pack --project-path com.unity.template-hd - dependencies: - - .yamato/_templates.yml#pre_pack_hdrp_template_OSX_CUSTOM-REVISION artifacts: packages: paths: @@ -330,8 +322,6 @@ pack_universal_template_Win_trunk: commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template pack --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#pre_pack_universal_template_Win_trunk artifacts: packages: paths: @@ -384,8 +374,6 @@ pack_universal_template_OSX_trunk: commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template pack --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#pre_pack_universal_template_OSX_trunk artifacts: packages: paths: @@ -476,8 +464,6 @@ pack_universal_template_Win_CUSTOM-REVISION: commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template pack --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#pre_pack_universal_template_Win_CUSTOM-REVISION artifacts: packages: paths: @@ -530,8 +516,6 @@ pack_universal_template_OSX_CUSTOM-REVISION: commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm - upm-ci template pack --project-path com.unity.template-universal - dependencies: - - .yamato/_templates.yml#pre_pack_universal_template_OSX_CUSTOM-REVISION artifacts: packages: paths: diff --git a/.yamato/config/_templates.metafile b/.yamato/config/_templates.metafile index c3577bcbe96..33c0bd6262e 100644 --- a/.yamato/config/_templates.metafile +++ b/.yamato/config/_templates.metafile @@ -8,7 +8,7 @@ templates: - vfx - config - hdrp - include_prepack_step: True + include_prepack_step: False - name: Universal Template id: universal_template packagename: com.unity.template-universal @@ -16,7 +16,7 @@ templates: - core - shadergraph - universal - include_prepack_step: True + include_prepack_step: False platforms: - name: Win - name: OSX diff --git a/.yamato/config/abv.metafile b/.yamato/config/abv.metafile index 02dc3cfc465..401d911492f 100644 --- a/.yamato/config/abv.metafile +++ b/.yamato/config/abv.metafile @@ -21,6 +21,7 @@ jobs: - .yamato/all-vfx.yml#Nightly_VFX_ - .yamato/all-urp.yml#Nightly_URP_ - .yamato/all-shadergraph.yml#Nightly_ShaderGraph_ + # - .yamato/_templates.yml#all_template_ci_ # Uncomment when the 13.0.0 packages land in the editor - .yamato/all-lightmapper.yml#LightMapper_ - #General_Checks_ triggers: diff --git a/.yamato/lightmapper-osx-metal.yml b/.yamato/lightmapper-osx-metal.yml index 0de32ca093e..ad4afeb4f0c 100644 --- a/.yamato/lightmapper-osx-metal.yml +++ b/.yamato/lightmapper-osx-metal.yml @@ -35,8 +35,7 @@ LightMapper_OSX_Metal_editmode_mono_Linear_trunk: - command: |5- ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/LightMapper/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/LightMapper --zero-tests-are-ok=1 " UTR_RESULT=$? - mkdir -p TestProjects/LightMapper/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper/test-results/ + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper exit $UTR_RESULT after: - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -76,8 +75,7 @@ LightMapper_OSX_Metal_Standalone_mono_Linear_trunk: - command: |5- ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/LightMapper/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/LightMapper --timeout=1200 --zero-tests-are-ok=1 " UTR_RESULT=$? - mkdir -p TestProjects/LightMapper/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper/test-results/ + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper exit $UTR_RESULT after: - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -117,8 +115,7 @@ LightMapper_OSX_Metal_editmode_mono_Linear_CUSTOM-REVISION: - command: |5- ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/LightMapper/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --platform=editmode --scripting-backend=Mono2x --suite=editor --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/LightMapper --zero-tests-are-ok=1 " UTR_RESULT=$? - mkdir -p TestProjects/LightMapper/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper/test-results/ + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper exit $UTR_RESULT after: - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade @@ -158,8 +155,7 @@ LightMapper_OSX_Metal_Standalone_mono_Linear_CUSTOM-REVISION: - command: |5- ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; ~/Graphics/utr $CACHE_ARGS --artifacts_path=/Users/bokken/Graphics/TestProjects/LightMapper/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/LightMapper --timeout=1200 --zero-tests-are-ok=1 " UTR_RESULT=$? - mkdir -p TestProjects/LightMapper/test-results/ - scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper/test-results/ + scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/LightMapper/test-results/ TestProjects/LightMapper exit $UTR_RESULT after: - command: pip3 install requests --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade diff --git a/.yamato/script/gfx_sdet_tools_revision.txt b/.yamato/script/gfx_sdet_tools_revision.txt index a0bc22f8190..ac17f286d91 100644 --- a/.yamato/script/gfx_sdet_tools_revision.txt +++ b/.yamato/script/gfx_sdet_tools_revision.txt @@ -1 +1 @@ -6acd136c0762743d489b003b1c0bc94d2ef03fb8 +83513b1518a8c43db2e2a009ca37e8a7f55c5196 diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json b/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json new file mode 100644 index 00000000000..2d01d2c75ce --- /dev/null +++ b/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json @@ -0,0 +1,9 @@ +{ + "ErrorExceptions": [ + { + "ValidationTest": "Primed Library Validation", + "PackageVersion": "13.0.0" + } + ], + "WarningExceptions": [] +} diff --git a/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json.meta b/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json.meta new file mode 100644 index 00000000000..21c9886cb09 --- /dev/null +++ b/com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ac99402d132d0a2499f247f2effbca6a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json b/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json new file mode 100644 index 00000000000..2d01d2c75ce --- /dev/null +++ b/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json @@ -0,0 +1,9 @@ +{ + "ErrorExceptions": [ + { + "ValidationTest": "Primed Library Validation", + "PackageVersion": "13.0.0" + } + ], + "WarningExceptions": [] +} diff --git a/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json.meta b/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json.meta new file mode 100644 index 00000000000..ff0d11489f4 --- /dev/null +++ b/com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f49c4fbdd763864499e11e81d3e27e00 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.unity.template-universal/Packages/manifest.json b/com.unity.template-universal/Packages/manifest.json index ac273e581b3..bac6a0fad1a 100644 --- a/com.unity.template-universal/Packages/manifest.json +++ b/com.unity.template-universal/Packages/manifest.json @@ -10,7 +10,7 @@ "com.unity.ide.visualstudio": "2.0.9", "com.unity.ide.vscode": "1.2.3", "com.unity.purchasing": "3.2.2", - "com.unity.render-pipelines.universal": "12.0.0", + "com.unity.render-pipelines.universal": "13.0.0", "com.unity.test-framework": "1.1.27", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.1",