Skip to content

Commit

Permalink
Update trunk version for all jobs (#2270)
Browse files Browse the repository at this point in the history
  • Loading branch information
Théo Penavaire authored Oct 19, 2020
1 parent b6b0cdc commit df2d4b8
Show file tree
Hide file tree
Showing 61 changed files with 220 additions and 220 deletions.
56 changes: 28 additions & 28 deletions .yamato/_packages.yml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions .yamato/_projectcontext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ test_all_project_windows_trunk:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor --wait --published-only
- unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor --wait --published-only
- upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests
artifacts:
logs:
Expand All @@ -310,7 +310,7 @@ test_all_project_macos_trunk:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor --wait --published-only
- unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor --wait --published-only
- upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests
artifacts:
logs:
Expand Down
16 changes: 8 additions & 8 deletions .yamato/_templates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ test_hdrp_template_windows_trunk:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor --wait --published-only
- unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor --wait --published-only
- for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
- copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
- upm-ci template test -u .\.Editor --project-path com.unity.template-hd
Expand All @@ -71,7 +71,7 @@ test_hdrp_template_windows_trunk_dependencies:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor --wait --published-only
- unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor --wait --published-only
- for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
- copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
- upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-hd
Expand All @@ -93,7 +93,7 @@ test_universal_template_windows_trunk:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor --wait --published-only
- unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor --wait --published-only
- for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
- copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
- upm-ci template test -u .\.Editor --project-path com.unity.template-universal
Expand All @@ -115,7 +115,7 @@ test_universal_template_windows_trunk_dependencies:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor --wait --published-only
- unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor --wait --published-only
- for /r packages_temp %%x in (*.tgz) do copy %%x upm-ci~\packages
- copy upm-ci~\packages\*.tgz .Editor\Data\Resources\PackageManager\Editor
- upm-ci template test -u .\.Editor --type updated-dependencies-tests --project-path com.unity.template-universal
Expand All @@ -139,7 +139,7 @@ test_hdrp_template_macos_trunk:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor --wait --published-only
- unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor --wait --published-only
- cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
- cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
- upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-hd
Expand All @@ -163,7 +163,7 @@ test_hdrp_template_macos_trunk_dependencies:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor --wait --published-only
- unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor --wait --published-only
- cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
- cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
- upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-hd
Expand All @@ -185,7 +185,7 @@ test_universal_template_macos_trunk:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor --wait --published-only
- unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor --wait --published-only
- cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
- cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
- upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path com.unity.template-universal
Expand All @@ -207,7 +207,7 @@ test_universal_template_macos_trunk_dependencies:
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor --wait --published-only
- unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor --wait --published-only
- cp packages_temp/**/upm-ci~/packages/*.tgz upm-ci~/packages
- cp ./upm-ci~/packages/*.tgz ./.Editor/Unity.app/Contents/Resources/PackageManager/Editor
- upm-ci template test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --type updated-dependencies-tests --project-path com.unity.template-universal
Expand Down
30 changes: 15 additions & 15 deletions .yamato/config/_latest_editor_versions_trunk.metafile
Original file line number Diff line number Diff line change
Expand Up @@ -9,49 +9,49 @@ editor_version_names:
editor_versions:
trunk_latest_internal:
android:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
ios:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
linux:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
macos:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
windows:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
trunk_latest_public:
android:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
ios:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
linux:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
macos:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
windows:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
trunk_staging:
android:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
ios:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
linux:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
macos:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
windows:
revision: 5181ec54d595526303eb2714f480cbc3ee1911bd
revision: 37c5ec4c3cb13853f9074c74cbac49a232178bd8
version: ''
8 changes: 4 additions & 4 deletions .yamato/hdrp-linux-vulkan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ HDRP_Linux_Vulkan_playmode_mono_apiNet2_Linear_trunk:
- sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr
- chmod +x TestProjects/HDRP_Tests/utr
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor -c il2cpp --wait --published-only
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only
- cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-vulkan"
artifacts:
logs:
Expand All @@ -36,7 +36,7 @@ HDRP_Linux_Vulkan_playmode_NonRenderGraph_mono_apiNet2_Linear_trunk:
- sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr
- chmod +x TestProjects/HDRP_Tests/utr
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor -c il2cpp --wait --published-only
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only
- cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-non-rendergraph-tests" --extra-editor-arg="-force-vulkan"
artifacts:
logs:
Expand All @@ -56,7 +56,7 @@ HDRP_Linux_Vulkan_editmode_mono_apiNet2_Linear_trunk:
- sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_Tests/utr
- chmod +x TestProjects/HDRP_Tests/utr
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor -c il2cpp --wait --published-only
- cd TestProjects/HDRP_Tests && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only
- cd TestProjects/HDRP_Tests && DISPLAY=:0.0 ./utr --suite=editor --platform=editmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --reruncount=2 --extra-editor-arg="-force-vulkan"
artifacts:
logs:
Expand Down Expand Up @@ -96,7 +96,7 @@ Build_HDRP_Linux_Vulkan_Player_mono_apiNet2_Linear_trunk:
- sudo -H pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
- curl -s https://artifactory.internal.unity3d.com/core-automation/tools/utr-standalone/utr --output TestProjects/HDRP_RuntimeTests/utr
- chmod +x TestProjects/HDRP_RuntimeTests/utr
- cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli -u 5181ec54d595526303eb2714f480cbc3ee1911bd -c editor -c il2cpp --wait --published-only
- cd TestProjects/HDRP_RuntimeTests && sudo unity-downloader-cli -u 37c5ec4c3cb13853f9074c74cbac49a232178bd8 -c editor -c il2cpp --wait --published-only
- cd TestProjects/HDRP_RuntimeTests && DISPLAY=:0.0 ./utr --suite=playmode --platform=StandaloneLinux64 --testproject=. --extra-editor-arg="-playergraphicsapi=Vulkan" --editor-location=.Editor --artifacts_path=test-results --player-save-path=../../players --build-only --scripting-backend=Mono2x --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --timeout=1200 --extra-editor-arg="CustomBuild.BuildLinuxVulkanLinear"
artifacts:
logs:
Expand Down
Loading

0 comments on commit df2d4b8

Please sign in to comment.