Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the templates pipelines #5627

Merged
merged 6 commits into from
Sep 14, 2021
Merged

Update the templates pipelines #5627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b864ae3
Remove dependency on pre-pack step
theopnv Sep 13, 2021
4024103
Add templates pipeline to nightly
theopnv Sep 13, 2021
844e0aa
Bump template version to 13.0.0
theopnv Sep 13, 2021
fe015bf
Add exception
theopnv Sep 14, 2021
69a589c
Merge branch 'master' into yamato/templates-pipelines-update
theopnv Sep 14, 2021
336933d
Remove pipeline from nightly
theopnv Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions .yamato/_templates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .yamato/config/_templates.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ templates:
- vfx
- config
- hdrp
include_prepack_step: True
include_prepack_step: False
- name: Universal Template
id: universal_template
packagename: com.unity.template-universal
dependencies:
- core
- shadergraph
- universal
include_prepack_step: True
include_prepack_step: False
platforms:
- name: Win
- name: OSX
Expand Down
1 change: 1 addition & 0 deletions .yamato/config/abv.metafile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
- .yamato/all-vfx.yml#Nightly_VFX_<TRACK>
- .yamato/all-urp.yml#Nightly_URP_<TRACK>
- .yamato/all-shadergraph.yml#Nightly_ShaderGraph_<TRACK>
# - .yamato/_templates.yml#all_template_ci_<TRACK> # Uncomment when the 13.0.0 packages land in the editor
- .yamato/all-lightmapper.yml#LightMapper_<TRACK>
- <PROJECT_ALL_YML_FILE>#General_Checks_<TRACK>
triggers:
Expand Down
12 changes: 4 additions & 8 deletions .yamato/lightmapper-osx-metal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .yamato/script/gfx_sdet_tools_revision.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6acd136c0762743d489b003b1c0bc94d2ef03fb8
83513b1518a8c43db2e2a009ca37e8a7f55c5196
9 changes: 9 additions & 0 deletions com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"ErrorExceptions": [
{
"ValidationTest": "Primed Library Validation",
"PackageVersion": "13.0.0"
}
],
"WarningExceptions": []
}
7 changes: 7 additions & 0 deletions com.unity.template-hd/Packages/com.unity.template.hd/ValidationExceptions.json.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions com.unity.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"ErrorExceptions": [
{
"ValidationTest": "Primed Library Validation",
"PackageVersion": "13.0.0"
}
],
"WarningExceptions": []
}
7 changes: 7 additions & 0 deletions ...y.template-universal/Packages/com.unity.template.universal/ValidationExceptions.json.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion com.unity.template-universal/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down