Skip to content

Commit 7eec420

Browse files
theo-at-unitytheo-at-unity
authored
Merge pull request #8244 from Unity-Technologies/ppv2/fix-projectwindow
[PPV2] Fixed obsolete ProjectWindow usage and test project dependencies
2 parents 0b48b12 + ee27c61 commit 7eec420

File tree

78 files changed

+4025
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+4025
-20
lines changed

‎.yamato/all-postprocessing.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ PR_PostProcessing_trunk:
1515
rerun: always
1616
- path: .yamato/postprocessing-osx-metal.yml#PostProcessing_OSX_Metal_playmode_mono_Linear_trunk
1717
rerun: always
18+
- path: .yamato/postprocessing-osx-metal.yml#PostProcessing_OSX_Metal_Standalone_mono_Linear_trunk
19+
rerun: always
1820
- path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_Standalone_mono_Linear_trunk
1921
rerun: always
2022
- path: .yamato/postprocessing-linux-vulkan.yml#PostProcessing_Linux_Vulkan_playmode_mono_Linear_trunk

‎.yamato/postprocessing-linux-vulkan.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PostProcessing_Linux_Vulkan_playmode_mono_Linear_trunk:
22
name: PostProcessing on Linux_Vulkan_playmode_mono_Linear on version trunk
33
agent:
44
type: Unity::VM::GPU
5-
image: desktop/ubuntu-20.04-desktop:v2.1348791
5+
image: desktop/ubuntu-22.04-desktop:v2.3440504
66
flavor: b1.large
77
variables:
88
CUSTOM_REVISION: 'trunk'
@@ -37,8 +37,8 @@ PostProcessing_Linux_Vulkan_Standalone_mono_Linear_trunk:
3737
name: PostProcessing on Linux_Vulkan_Standalone_mono_Linear on version trunk
3838
agent:
3939
type: Unity::VM::GPU
40-
image: desktop/ubuntu-20.04-desktop:v2.1348791
41-
flavor: b1.large
40+
image: desktop/ubuntu-22.04-desktop:v2.3440504
41+
flavor: b1.xlarge
4242
variables:
4343
CUSTOM_REVISION: 'trunk'
4444
TEST_FILTER: .*
@@ -66,7 +66,7 @@ Build_PostProcessing_Linux_Vulkan_Standalone_mono_Linear_trunk:
6666
name: Build PostProcessing on Linux_Vulkan_mono_Linear_Standalone_build_Player on version trunk
6767
agent:
6868
type: Unity::VM
69-
image: desktop/ubuntu-20.04-desktop:v2.1348791
69+
image: desktop/ubuntu-22.04-desktop:v2.3440504
7070
flavor: b1.xlarge
7171
variables:
7272
CUSTOM_REVISION: 'trunk'

‎.yamato/postprocessing-osx-metal.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@ PostProcessing_OSX_Metal_playmode_mono_Linear_trunk:
22
name: PostProcessing on OSX_Metal_playmode_mono_Linear on version trunk
33
agent:
44
type: Unity::metal::macmini
5-
image: automation-tooling/macos-11:v2.1987114
5+
image: automation-tooling/macos-13:v2.4694476
66
flavor: m1.mac
7-
model: 2018-i3-macos11
7+
model: 2018-i7-macos14
88
variables:
99
CUSTOM_REVISION: 'trunk'
1010
TEST_FILTER: .*
1111
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
1212
UTR_VERSION: "current"
1313
commands:
14-
- pip3 install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
14+
- brew tap Unity-Technologies/homebrew-unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git
15+
- brew install Unity-Technologies/homebrew-unity/unity-downloader-cli
1516
- unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
1617
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
1718
retries: 2
@@ -21,7 +22,7 @@ PostProcessing_OSX_Metal_playmode_mono_Linear_trunk:
2122
- command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
2223
retries: 2
2324
- command: |2-
24-
ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=/Users/bokken/Graphics/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests "
25+
ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=/Users/bokken/Graphics/.Editor --extra-editor-arg="-colorspace=Linear" --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests"
2526
UTR_RESULT=$?
2627
scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results/ TestProjects/PostProcessing_Tests
2728
exit $UTR_RESULT
@@ -40,16 +41,17 @@ PostProcessing_OSX_Metal_Standalone_mono_Linear_trunk:
4041
name: PostProcessing on OSX_Metal_Standalone_mono_Linear on version trunk
4142
agent:
4243
type: Unity::metal::macmini
43-
image: automation-tooling/macos-11:v2.1987114
44+
image: automation-tooling/macos-13:v2.4694476
4445
flavor: m1.mac
45-
model: 2018-i3-macos11
46+
model: 2018-i7-macos14
4647
variables:
4748
CUSTOM_REVISION: 'trunk'
4849
TEST_FILTER: .*
4950
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
5051
UTR_VERSION: "current"
5152
commands:
52-
- pip3 install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
53+
- brew tap Unity-Technologies/homebrew-unity git@github.cds.internal.unity3d.com:unity/homebrew-unity.git
54+
- brew install Unity-Technologies/homebrew-unity/unity-downloader-cli
5355
- unity-downloader-cli --source-file unity_revision.txt -c editor -c il2cpp --wait --published-only
5456
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr
5557
retries: 2
@@ -59,7 +61,7 @@ PostProcessing_OSX_Metal_Standalone_mono_Linear_trunk:
5961
- command: scp -i ~/.ssh/id_rsa_macmini ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
6062
retries: 2
6163
- command: |2-
62-
ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests --timeout=2400 "
64+
ssh -i ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; GIT_BRANCH='$GIT_BRANCH' GIT_COMMIT_TIME='$GIT_COMMIT_TIME' GIT_REPOSITORY_URL='$GIT_REPOSITORY_URL' GIT_REVISION='$GIT_REVISION' YAMATO_JOBDEFINITION_FRIENDLY_NAME='$YAMATO_JOBDEFINITION_FRIENDLY_NAME' YAMATO_JOBDEFINITION_NAME='$YAMATO_JOBDEFINITION_NAME' YAMATO_JOB_ID='$YAMATO_JOB_ID' YAMATO_PROJECT_ID='$YAMATO_PROJECT_ID' YAMATO_PROJECT_NAME='$YAMATO_PROJECT_NAME' ~/Graphics/utr --artifacts_path=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results --editor-location=/Users/bokken/Graphics/.Editor --platform=StandaloneOSX --scripting-backend=Mono2x --suite=playmode --testfilter=$TEST_FILTER --testproject=/Users/bokken/Graphics/TestProjects/PostProcessing_Tests --timeout=2400"
6365
UTR_RESULT=$?
6466
scp -i ~/.ssh/id_rsa_macmini -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/Graphics/TestProjects/PostProcessing_Tests/test-results/ TestProjects/PostProcessing_Tests
6567
exit $UTR_RESULT

‎.yamato/postprocessing-win-dx11.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ PostProcessing_Win_DX11_Standalone_mono_Linear_trunk:
3030
agent:
3131
type: Unity::VM::GPU
3232
image: automation-tooling/win10-21H1:v2.2309361
33-
flavor: b1.large
33+
flavor: b1.xlarge
3434
variables:
3535
CUSTOM_REVISION: 'trunk'
3636
TEST_FILTER: .*
@@ -68,7 +68,7 @@ Build_PostProcessing_Win_DX11_Standalone_mono_Linear_trunk:
6868
retries: 2
6969
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
7070
retries: 2
71-
- command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d11" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Direct3D11" --platform=StandaloneWindows64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests --timeout=1200
71+
- command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d11" --extra-editor-arg="Linear" --playerGraphicsAPI=Direct3D11 --platform=StandaloneWindows64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests --timeout=1200
7272
artifacts:
7373
logs:
7474
paths:

‎.yamato/postprocessing-win-dx12.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ PostProcessing_Win_DX12_Standalone_mono_Linear_trunk:
3030
agent:
3131
type: Unity::VM::GPU
3232
image: automation-tooling/win10-21H1:v2.2309361
33-
flavor: b1.large
33+
flavor: b1.xlarge
3434
variables:
3535
CUSTOM_REVISION: 'trunk'
3636
TEST_FILTER: .*
@@ -68,7 +68,7 @@ Build_PostProcessing_Win_DX12_Standalone_mono_Linear_trunk:
6868
retries: 2
6969
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
7070
retries: 2
71-
- command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d12" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Direct3D12" --platform=StandaloneWindows64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests --timeout=1200
71+
- command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="d3d12" --extra-editor-arg="Linear" --playerGraphicsAPI=Direct3D12 --platform=StandaloneWindows64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests --timeout=1200
7272
artifacts:
7373
logs:
7474
paths:

‎.yamato/postprocessing-win-vulkan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ PostProcessing_Win_Vulkan_Standalone_mono_Linear_trunk:
3030
agent:
3131
type: Unity::VM::GPU
3232
image: automation-tooling/win10-21H1:v2.2309361
33-
flavor: b1.large
33+
flavor: b1.xlarge
3434
variables:
3535
CUSTOM_REVISION: 'trunk'
3636
TEST_FILTER: .*
@@ -68,7 +68,7 @@ Build_PostProcessing_Win_Vulkan_Standalone_mono_Linear_trunk:
6868
retries: 2
6969
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
7070
retries: 2
71-
- command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --extra-editor-arg="-playergraphicsapi=Vulkan" --platform=StandaloneWindows64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests --timeout=1200
71+
- command: utr --artifacts_path=TestProjects/PostProcessing_Tests/test-results --build-only --editor-location=.Editor --extra-editor-arg="-colorspace=Linear" --extra-editor-arg="-executemethod" --extra-editor-arg="SetupProject.ApplySettings" --extra-editor-arg="vulkan" --extra-editor-arg="Linear" --playerGraphicsAPI=Vulkan --platform=StandaloneWindows64 --player-save-path=players --scripting-backend=Mono2x --suite=playmode --testfilter=%TEST_FILTER% --testproject=./TestProjects/PostProcessing_Tests --timeout=1200
7272
artifacts:
7373
logs:
7474
paths:

‎TestProjects/PostProcessing_Tests/Assets/ReferenceImages/Linear/OSXPlayer.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TestProjects/PostProcessing_Tests/Assets/ReferenceImages/Linear/OSXPlayer/Metal.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TestProjects/PostProcessing_Tests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TestProjects/PostProcessing_Tests/Assets/ReferenceImages/Linear/OSXPlayer/Metal/None/0001_Std_Empty_Forward_LDR_NoMSAA.png‎

Lines changed: 3 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)