From 723fcd0980b27d4d0a40748cc5535948d9b2842e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Tue, 11 May 2021 17:25:31 +0200 Subject: [PATCH 1/3] Remove upmNoDefaultPackages --- .yamato/_projectcontext.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.yamato/_projectcontext.yml b/.yamato/_projectcontext.yml index 83ade0936f0..e6616608851 100644 --- a/.yamato/_projectcontext.yml +++ b/.yamato/_projectcontext.yml @@ -238,7 +238,7 @@ test_all_project_Win_trunk: - 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 --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" + - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests artifacts: logs: paths: @@ -258,7 +258,7 @@ test_all_project_OSX_trunk: - 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 --source-file unity_revision.txt -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 --extra-create-project-arg="-upmNoDefaultPackages" + - upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests artifacts: logs: paths: @@ -278,7 +278,7 @@ test_all_project_Win_CUSTOM-REVISION: - 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 --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" + - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests artifacts: logs: paths: @@ -298,7 +298,7 @@ test_all_project_OSX_CUSTOM-REVISION: - 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 --source-file unity_revision.txt -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 --extra-create-project-arg="-upmNoDefaultPackages" + - upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests artifacts: logs: paths: @@ -318,7 +318,7 @@ test_all_project_Win_min_editor: - 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 --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" + - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests artifacts: logs: paths: @@ -336,7 +336,7 @@ test_all_project_OSX_min_editor: - 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 --source-file unity_revision.txt -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 --extra-create-project-arg="-upmNoDefaultPackages" + - upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests artifacts: logs: paths: From dee3a38addf2b0d446d12288403e9dff70ce4d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Wed, 12 May 2021 09:26:03 +0200 Subject: [PATCH 2/3] Revert "Remove upmNoDefaultPackages" This reverts commit 723fcd0980b27d4d0a40748cc5535948d9b2842e. --- .yamato/_projectcontext.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.yamato/_projectcontext.yml b/.yamato/_projectcontext.yml index e6616608851..83ade0936f0 100644 --- a/.yamato/_projectcontext.yml +++ b/.yamato/_projectcontext.yml @@ -238,7 +238,7 @@ test_all_project_Win_trunk: - 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 --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests + - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" artifacts: logs: paths: @@ -258,7 +258,7 @@ test_all_project_OSX_trunk: - 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 --source-file unity_revision.txt -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 + - upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" artifacts: logs: paths: @@ -278,7 +278,7 @@ test_all_project_Win_CUSTOM-REVISION: - 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 --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests + - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" artifacts: logs: paths: @@ -298,7 +298,7 @@ test_all_project_OSX_CUSTOM-REVISION: - 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 --source-file unity_revision.txt -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 + - upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" artifacts: logs: paths: @@ -318,7 +318,7 @@ test_all_project_Win_min_editor: - 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 --source-file unity_revision.txt -c editor --wait --published-only - - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests + - upm-ci project test -u .\.Editor --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" artifacts: logs: paths: @@ -336,7 +336,7 @@ test_all_project_OSX_min_editor: - 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 --source-file unity_revision.txt -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 + - upm-ci project test -u $(pwd)/.Editor/Unity.app/Contents/MacOS/Unity --project-path TestProjects/SRP_SmokeTest --type vetting-tests --extra-create-project-arg="-upmNoDefaultPackages" artifacts: logs: paths: From ad1ba54e79570ec5a574b7e2220a4ea6dbdc6aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Penavaire?= Date: Wed, 12 May 2021 09:32:07 +0200 Subject: [PATCH 3/3] Add terrain module to hdrp deps --- com.unity.render-pipelines.high-definition/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.render-pipelines.high-definition/package.json b/com.unity.render-pipelines.high-definition/package.json index 3352015df26..bfc1014433b 100644 --- a/com.unity.render-pipelines.high-definition/package.json +++ b/com.unity.render-pipelines.high-definition/package.json @@ -9,6 +9,7 @@ "com.unity.modules.video": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.terrain": "1.0.0", "com.unity.render-pipelines.core": "12.0.0", "com.unity.shadergraph": "12.0.0", "com.unity.visualeffectgraph": "12.0.0",