Skip to content

Commit d9b0581

Browse files
thomas-zengthomas-zeng
committed
Merge branch 'master' of https://github.com/Unity-Technologies/Graphics into universal/xr/fix-mirror-view-convention
2 parents 53b2082 + 8bc58a4 commit d9b0581

File tree

1,000 files changed

+58359
-9783
lines changed

Some content is hidden

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

1,000 files changed

+58359
-9783
lines changed

‎.yamato/_abv.yml‎

Lines changed: 43 additions & 234 deletions
Large diffs are not rendered by default.

‎.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

‎.yamato/_editor_priming.yml‎

Lines changed: 0 additions & 180 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,6 @@
33
# Introduce any changes under .yamato/config/*.metafile files (for most cases) or under .yamato/ruamel/* within Python (more elaborate cases), and rerun build.py to regenerate all .yml files.
44
# Read more under .yamato/docs/readme.md
55

6-
editor:priming:trunk:macos:
7-
name: '[trunk,macos] Editor priming'
8-
agent:
9-
type: Unity::VM
10-
image: cds-ops/ubuntu-16.04-base:stable
11-
flavor: b1.small
12-
skip_checkout: true
13-
variables:
14-
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
15-
DISPLAY: ":0"
16-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
17-
commands:
18-
- pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
19-
- unity-downloader-cli -u trunk -o macos --wait --skip-download -c editor -c il2cpp > unity_revision.txt
20-
artifacts:
21-
unity_revision.zip:
22-
paths:
23-
- "unity_revision.txt"
24-
editor:priming:2020.2:macos:
25-
name: '[2020.2,macos] Editor priming'
26-
agent:
27-
type: Unity::VM
28-
image: cds-ops/ubuntu-16.04-base:stable
29-
flavor: b1.small
30-
skip_checkout: true
31-
variables:
32-
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
33-
DISPLAY: ":0"
34-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
35-
commands:
36-
- pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
37-
- unity-downloader-cli -u 2020.2 -o macos --wait --skip-download -c editor -c il2cpp > unity_revision.txt
38-
artifacts:
39-
unity_revision.zip:
40-
paths:
41-
- "unity_revision.txt"
426
editor:priming:CUSTOM-REVISION:macos:
437
name: '[CUSTOM-REVISION,macos] Editor priming'
448
agent:
@@ -77,42 +41,6 @@ editor:priming:test_min_editor:macos:
7741
unity_revision.zip:
7842
paths:
7943
- "unity_revision.txt"
80-
editor:priming:trunk:android:
81-
name: '[trunk,android] Editor priming'
82-
agent:
83-
type: Unity::VM
84-
image: cds-ops/ubuntu-16.04-base:stable
85-
flavor: b1.small
86-
skip_checkout: true
87-
variables:
88-
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
89-
DISPLAY: ":0"
90-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
91-
commands:
92-
- pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
93-
- unity-downloader-cli -u trunk -o windows --wait --skip-download -c editor -c il2cpp -c android > unity_revision.txt
94-
artifacts:
95-
unity_revision.zip:
96-
paths:
97-
- "unity_revision.txt"
98-
editor:priming:2020.2:android:
99-
name: '[2020.2,android] Editor priming'
100-
agent:
101-
type: Unity::VM
102-
image: cds-ops/ubuntu-16.04-base:stable
103-
flavor: b1.small
104-
skip_checkout: true
105-
variables:
106-
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
107-
DISPLAY: ":0"
108-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
109-
commands:
110-
- pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
111-
- unity-downloader-cli -u 2020.2 -o windows --wait --skip-download -c editor -c il2cpp -c android > unity_revision.txt
112-
artifacts:
113-
unity_revision.zip:
114-
paths:
115-
- "unity_revision.txt"
11644
editor:priming:CUSTOM-REVISION:android:
11745
name: '[CUSTOM-REVISION,android] Editor priming'
11846
agent:
@@ -151,42 +79,6 @@ editor:priming:test_min_editor:android:
15179
unity_revision.zip:
15280
paths:
15381
- "unity_revision.txt"
154-
editor:priming:trunk:windows:
155-
name: '[trunk,windows] Editor priming'
156-
agent:
157-
type: Unity::VM
158-
image: cds-ops/ubuntu-16.04-base:stable
159-
flavor: b1.small
160-
skip_checkout: true
161-
variables:
162-
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
163-
DISPLAY: ":0"
164-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
165-
commands:
166-
- pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
167-
- unity-downloader-cli -u trunk -o windows --wait --skip-download -c editor -c il2cpp > unity_revision.txt
168-
artifacts:
169-
unity_revision.zip:
170-
paths:
171-
- "unity_revision.txt"
172-
editor:priming:2020.2:windows:
173-
name: '[2020.2,windows] Editor priming'
174-
agent:
175-
type: Unity::VM
176-
image: cds-ops/ubuntu-16.04-base:stable
177-
flavor: b1.small
178-
skip_checkout: true
179-
variables:
180-
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
181-
DISPLAY: ":0"
182-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
183-
commands:
184-
- pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
185-
- unity-downloader-cli -u 2020.2 -o windows --wait --skip-download -c editor -c il2cpp > unity_revision.txt
186-
artifacts:
187-
unity_revision.zip:
188-
paths:
189-
- "unity_revision.txt"
19082
editor:priming:CUSTOM-REVISION:windows:
19183
name: '[CUSTOM-REVISION,windows] Editor priming'
19284
agent:
@@ -225,42 +117,6 @@ editor:priming:test_min_editor:windows:
225117
unity_revision.zip:
226118
paths:
227119
- "unity_revision.txt"
228-
editor:priming:trunk:linux:
229-
name: '[trunk,linux] Editor priming'
230-
agent:
231-
type: Unity::VM
232-
image: cds-ops/ubuntu-16.04-base:stable
233-
flavor: b1.small
234-
skip_checkout: true
235-
variables:
236-
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
237-
DISPLAY: ":0"
238-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
239-
commands:
240-
- pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
241-
- unity-downloader-cli -u trunk -o linux --wait --skip-download -c editor -c il2cpp > unity_revision.txt
242-
artifacts:
243-
unity_revision.zip:
244-
paths:
245-
- "unity_revision.txt"
246-
editor:priming:2020.2:linux:
247-
name: '[2020.2,linux] Editor priming'
248-
agent:
249-
type: Unity::VM
250-
image: cds-ops/ubuntu-16.04-base:stable
251-
flavor: b1.small
252-
skip_checkout: true
253-
variables:
254-
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
255-
DISPLAY: ":0"
256-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
257-
commands:
258-
- pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
259-
- unity-downloader-cli -u 2020.2 -o linux --wait --skip-download -c editor -c il2cpp > unity_revision.txt
260-
artifacts:
261-
unity_revision.zip:
262-
paths:
263-
- "unity_revision.txt"
264120
editor:priming:CUSTOM-REVISION:linux:
265121
name: '[CUSTOM-REVISION,linux] Editor priming'
266122
agent:
@@ -299,42 +155,6 @@ editor:priming:test_min_editor:linux:
299155
unity_revision.zip:
300156
paths:
301157
- "unity_revision.txt"
302-
editor:priming:trunk:ios:
303-
name: '[trunk,ios] Editor priming'
304-
agent:
305-
type: Unity::VM
306-
image: cds-ops/ubuntu-16.04-base:stable
307-
flavor: b1.small
308-
skip_checkout: true
309-
variables:
310-
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
311-
DISPLAY: ":0"
312-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
313-
commands:
314-
- pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
315-
- unity-downloader-cli -u trunk -o macos --wait --skip-download -c editor -c iOS > unity_revision.txt
316-
artifacts:
317-
unity_revision.zip:
318-
paths:
319-
- "unity_revision.txt"
320-
editor:priming:2020.2:ios:
321-
name: '[2020.2,ios] Editor priming'
322-
agent:
323-
type: Unity::VM
324-
image: cds-ops/ubuntu-16.04-base:stable
325-
flavor: b1.small
326-
skip_checkout: true
327-
variables:
328-
PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
329-
DISPLAY: ":0"
330-
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
331-
commands:
332-
- pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
333-
- unity-downloader-cli -u 2020.2 -o macos --wait --skip-download -c editor -c iOS > unity_revision.txt
334-
artifacts:
335-
unity_revision.zip:
336-
paths:
337-
- "unity_revision.txt"
338158
editor:priming:CUSTOM-REVISION:ios:
339159
name: '[CUSTOM-REVISION,ios] Editor priming'
340160
agent:

0 commit comments

Comments
 (0)