Skip to content

Commit 502a242

Browse files
nigeljw-unitynigeljw-unity
committed
Merge branch 'master' into universal/sun-source-light-type
2 parents 2c742d8 + acaf95d commit 502a242

File tree

358 files changed

+33612
-7324
lines changed

Some content is hidden

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

358 files changed

+33612
-7324
lines changed

‎.yamato/_abv.yml‎

Lines changed: 11 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,17 @@ all_project_ci_nightly_trunk:
5959
recurring:
6060
- branch: master
6161
frequency: 0 * * ?
62+
all_project_ci_weekly_trunk:
63+
name: _Weekly ABV against trunk
64+
dependencies:
65+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_NonRenderGraph_mono_apiNet2_Linear_trunk
66+
rerun: on-new-revision
67+
- path: .yamato/hdrp_dxr-win-dx12.yml#HDRP_DXR_Win_DX12_playmode_NonRenderGraph_mono_apiNet2_Linear_trunk
68+
rerun: on-new-revision
69+
triggers:
70+
recurring:
71+
- branch: master
72+
frequency: weekly
6273
trunk_verification_trunk:
6374
name: Trunk verification - trunk
6475
dependencies:
@@ -80,85 +91,6 @@ trunk_verification_trunk:
8091
rerun: on-new-revision
8192
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_apiNet2_Linear_trunk
8293
rerun: on-new-revision
83-
all_project_ci_2020.2:
84-
name: _ABV for SRP repository - 2020.2
85-
dependencies:
86-
- path: .yamato/_projectcontext.yml#all_package_ci_project_2020.2
87-
rerun: on-new-revision
88-
- path: .yamato/all-universal.yml#All_Universal_2020.2
89-
rerun: on-new-revision
90-
- path: .yamato/all-shadergraph.yml#All_ShaderGraph_2020.2
91-
rerun: on-new-revision
92-
- path: .yamato/all-hdrp.yml#All_HDRP_2020.2
93-
rerun: on-new-revision
94-
- path: .yamato/all-vfx_hdrp.yml#All_VFX_HDRP_2020.2
95-
rerun: on-new-revision
96-
- path: .yamato/all-vfx_urp.yml#All_VFX_URP_2020.2
97-
rerun: on-new-revision
98-
triggers:
99-
expression: pull_request.target eq "master" AND NOT pull_request.draft AND NOT pull_request.push.changes.all match ["**/*.md", "doc/**/*", "**/Documentation*/**/*", ".github/**/*", "Tools/**/*"]
100-
all_project_ci_nightly_2020.2:
101-
name: _Nightly ABV against 2020.2
102-
dependencies:
103-
- path: .yamato/_abv.yml#all_project_ci_2020.2
104-
rerun: on-new-revision
105-
- path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
106-
rerun: on-new-revision
107-
- path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
108-
rerun: on-new-revision
109-
- path: .yamato/smoke_test-win-dx11.yml#Smoke_Test_Win_DX11_Standalone_mono_apiNet2_Linear_2020.2
110-
rerun: on-new-revision
111-
- path: .yamato/universal-android-opengles3.yml#Universal_Android_OpenGLES3_Standalone_il2cpp_apiNet4_Linear_2020.2
112-
rerun: on-new-revision
113-
- path: .yamato/universal-android-vulkan.yml#Universal_Android_Vulkan_Standalone_il2cpp_apiNet4_Linear_2020.2
114-
rerun: on-new-revision
115-
- path: .yamato/universal-iphone-metal.yml#Universal_iPhone_Metal_Standalone_mono_apiNet2_Linear_2020.2
116-
rerun: on-new-revision
117-
- path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_mono_apiNet2_Linear_2020.2
118-
rerun: on-new-revision
119-
- path: .yamato/universal-win-vulkan.yml#Universal_Win_Vulkan_playmode_XR_mono_apiNet2_Linear_2020.2
120-
rerun: on-new-revision
121-
- path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_Standalone_mono_apiNet2_Linear_2020.2
122-
rerun: on-new-revision
123-
- path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_editmode_mono_apiNet2_Linear_2020.2
124-
rerun: on-new-revision
125-
- path: .yamato/universal-win-dx12.yml#Universal_Win_DX12_playmode_mono_apiNet2_Linear_2020.2
126-
rerun: on-new-revision
127-
- path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
128-
rerun: on-new-revision
129-
- path: .yamato/urpupdate-win-dx11.yml#URPUpdate_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
130-
rerun: on-new-revision
131-
- path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
132-
rerun: on-new-revision
133-
- path: .yamato/urpupdate_top_asset_store-win-dx11.yml#URPUpdate_Top_Asset_Store_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
134-
rerun: on-new-revision
135-
- path: .yamato/all-urp_performance_boatattack.yml#All_URP_Performance_BoatAttack_2020.2
136-
rerun: on-new-revision
137-
triggers:
138-
recurring:
139-
- branch: master
140-
frequency: 0 * * ?
141-
trunk_verification_2020.2:
142-
name: Trunk verification - 2020.2
143-
dependencies:
144-
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
145-
rerun: on-new-revision
146-
- path: .yamato/universal-win-dx11.yml#Universal_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
147-
rerun: on-new-revision
148-
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
149-
rerun: on-new-revision
150-
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
151-
rerun: on-new-revision
152-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
153-
rerun: on-new-revision
154-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
155-
rerun: on-new-revision
156-
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
157-
rerun: on-new-revision
158-
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_apiNet2_Linear_2020.2
159-
rerun: on-new-revision
160-
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_apiNet2_Linear_2020.2
161-
rerun: on-new-revision
16294
all_project_ci_CUSTOM-REVISION:
16395
name: _ABV for SRP repository - CUSTOM-REVISION
16496
dependencies:

‎.yamato/_editor_pinning.yml‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -107,57 +107,6 @@ editor-pinning-merge-revisions-trunk-abv:
107107
- git config --global user.name "[email protected]"
108108
- git config --global user.email "[email protected]"
109109
- pipenv run python3 .yamato/ruamel/editor_pinning/merge_revisions.py --revision $GIT_REVISION --target-branch master --track trunk
110-
editor-pinning-merge-revisions-2020.2:
111-
name: Merge [2020.2] revisions to master [no ABV]
112-
agent:
113-
type: Unity::VM
114-
image: package-ci/ubuntu:stable
115-
flavor: b1.small
116-
variables:
117-
CI: true
118-
commands:
119-
- sudo pip3 install pipenv --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
120-
- python3 -m pipenv install --dev
121-
- curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
122-
- sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
123-
- sudo apt-get update
124-
- sudo apt-get install yamato-parser -y
125-
- |5-
126-
127-
if [[ "$GIT_BRANCH" != "ci/editor-pinning" ]]; then
128-
echo "Should run on 'ci/editor-pinning' but is running on '$GIT_BRANCH'"
129-
exit 1
130-
fi
131-
- git config --global user.name "[email protected]"
132-
- git config --global user.email "[email protected]"
133-
- pipenv run python3 .yamato/ruamel/editor_pinning/merge_revisions.py --revision $GIT_REVISION --target-branch master --track 2020.2
134-
editor-pinning-merge-revisions-2020.2-abv:
135-
name: Merge [2020.2] revisions to master [ABV]
136-
allow_failure: true
137-
dependencies:
138-
- .yamato/_abv.yml#all_project_ci_2020.2
139-
agent:
140-
type: Unity::VM
141-
image: package-ci/ubuntu:stable
142-
flavor: b1.small
143-
variables:
144-
CI: true
145-
commands:
146-
- sudo pip3 install pipenv --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
147-
- python3 -m pipenv install --dev
148-
- curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
149-
- sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
150-
- sudo apt-get update
151-
- sudo apt-get install yamato-parser -y
152-
- |5-
153-
154-
if [[ "$GIT_BRANCH" != "ci/editor-pinning" ]]; then
155-
echo "Should run on 'ci/editor-pinning' but is running on '$GIT_BRANCH'"
156-
exit 1
157-
fi
158-
- git config --global user.name "[email protected]"
159-
- git config --global user.email "[email protected]"
160-
- pipenv run python3 .yamato/ruamel/editor_pinning/merge_revisions.py --revision $GIT_REVISION --target-branch master --track 2020.2
161110
editor-pinning-merge-all:
162111
name: Merge all [no ABV] [no CI]
163112
agent:
@@ -168,7 +117,6 @@ editor-pinning-merge-all:
168117
CI: true
169118
dependencies:
170119
- .yamato/_editor_pinning.yml#editor-pinning-merge-revisions-trunk
171-
- .yamato/_editor_pinning.yml#editor-pinning-merge-revisions-2020.2
172120
commands:
173121
- sudo pip3 install pipenv --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
174122
- python3 -m pipenv install --dev
@@ -201,7 +149,6 @@ editor-pinning-merge-all-abv:
201149
CI: true
202150
dependencies:
203151
- .yamato/_editor_pinning.yml#editor-pinning-merge-revisions-trunk-abv
204-
- .yamato/_editor_pinning.yml#editor-pinning-merge-revisions-2020.2-abv
205152
commands:
206153
- sudo pip3 install pipenv --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
207154
- python3 -m pipenv install --dev

0 commit comments

Comments
 (0)