Skip to content

Commit eb5b812

Browse files
NEW: MERGE DEVELOP.
2 parents a5a8609 + 533651a commit eb5b812

File tree

1,288 files changed

+286459
-25115
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,288 files changed

+286459
-25115
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,4 @@ Packages/com.unity.inputsystem/.npmrc
2828
Packages/com.unity.package-manager-doctools/
2929
Packages/com.unity.package-manager-ui/
3030

31+
.Editor

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Tools/CodeAnalyzerTestProject/api-analyzers"]
2+
path = Tools/CodeAnalyzerTestProject/api-analyzers
3+
url = https://github.com/Unity-Technologies/api-anaylzers

.yamato/analyze.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
code_analyser:
2+
name : Code Analyzer
3+
agent:
4+
type: Unity::VM::osx
5+
image: buildfarm/mac:stable
6+
flavor: m1.mac
7+
commands:
8+
- git submodule update --init
9+
- mkdir Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
10+
- curl -L https://www.nuget.org/api/v2/package/Microsoft.CodeQuality.Analyzers/2.9.2 -o Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.zip
11+
- unzip Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.zip -d Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
12+
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
13+
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
14+
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2019.1
15+
triggers:
16+
branches:
17+
only:
18+
- "/.*/"
19+
artifacts:
20+
UTR_Output.zip:
21+
paths:
22+
- "upm-ci~/test-results/**/*"

.yamato/promotion.yml

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
test_editors:
2+
- version: 2019.1
3+
test_platforms:
4+
- name: win
5+
type: Unity::VM
6+
image: package-ci/win10:stable
7+
flavor: m1.large
8+
---
9+
{% for editor in test_editors %}
10+
{% for platform in test_platforms %}
11+
promotion_test_{{ platform.name }}_{{ editor.version }}:
12+
name : Promotion Test {{ editor.version }} on {{ platform.name }}
13+
agent:
14+
type: {{ platform.type }}
15+
image: {{ platform.image }}
16+
flavor: {{ platform.flavor}}
17+
variables:
18+
UPMCI_PROMOTION: 1
19+
commands:
20+
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
21+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
22+
artifacts:
23+
logs:
24+
paths:
25+
- "upm-ci~/test-results/**/*"
26+
dependencies:
27+
- .yamato/upm-ci.yml#pack
28+
{% endfor %}
29+
{% endfor %}
30+
31+
promotion_test_trigger:
32+
name: Promotion Tests Trigger
33+
agent:
34+
type: Unity::VM
35+
image: package-ci/win10:stable
36+
flavor: m1.large
37+
artifacts:
38+
logs:
39+
paths:
40+
- "upm-ci~/test-results/**/*"
41+
packages:
42+
paths:
43+
- "upm-ci~/packages/**/*"
44+
dependencies:
45+
{% for editor in test_editors %}
46+
{% for platform in test_platforms %}
47+
- .yamato/promotion.yml#promotion_test_{{platform.name}}_{{editor.version}}
48+
{% endfor %}
49+
{% endfor %}
50+
51+
promote:
52+
name: Promote to Production
53+
agent:
54+
type: Unity::VM
55+
image: package-ci/win10:stable
56+
flavor: m1.large
57+
variables:
58+
UPMCI_PROMOTION: 1
59+
commands:
60+
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
61+
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
62+
- upm-ci package promote --package-path ./Packages/com.unity.inputsystem/
63+
triggers:
64+
tags:
65+
only:
66+
- /^(r|R)elease-\d+\.\d+\.\d+(-preview(\.\d+)?)?$/
67+
artifacts:
68+
artifacts:
69+
paths:
70+
- "upm-ci~/packages/*.tgz"
71+
dependencies:
72+
{% for editor in test_editors %}
73+
{% for platform in test_platforms %}
74+
- .yamato/promotion.yml#promotion_test_{{ platform.name }}_{{ editor.version }}
75+
{% endfor %}
76+
{% endfor %}

.yamato/upm-ci.yml

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@ platforms:
44
- name: win
55
type: Unity::VM
66
image: package-ci/win10:latest
7-
flavor: m1.large
7+
flavor: b1.large
88
- name: win_standalone
99
type: Unity::VM
1010
image: package-ci/win10:latest
11-
flavor: m1.large
11+
flavor: b1.large
12+
runtime: StandaloneWindows64
13+
- name: win_standalone_il2cpp
14+
type: Unity::VM
15+
image: package-ci/win10:latest
16+
flavor: b1.large
1217
runtime: StandaloneWindows64
18+
scripting-backend: Il2Cpp
19+
installscript: c:\python27\Scripts\unity-downloader-cli.exe -c editor -c StandaloneSupport-IL2CPP -w -u
1320
- name: mac
1421
type: Unity::VM::osx
1522
image: buildfarm/mac:stable
@@ -19,6 +26,13 @@ platforms:
1926
image: buildfarm/mac:stable
2027
flavor: m1.mac
2128
runtime: StandaloneOSX
29+
- name: mac_standalone_il2cpp
30+
type: Unity::VM::osx
31+
image: buildfarm/mac:stable
32+
flavor: m1.mac
33+
runtime: StandaloneOSX
34+
scripting-backend: Il2Cpp
35+
installscript: ~/Library/Python/2.7/bin/unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP -w -u
2236
---
2337
{% for editor in editors %}
2438
{% for platform in platforms %}
@@ -32,7 +46,8 @@ platforms:
3246
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
3347
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
3448
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
35-
- upm-ci~/tools/utr/utr --testproject=. --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode --stdout-filter=minimal {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %}
49+
- {% if platform.installscript %} {{ platform.installscript }} {{ editor.version }} {% endif %}
50+
- upm-ci~/tools/utr/utr --testproject=. --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode --api-profile=NET_4_6 --stdout-filter=minimal {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %}
3651
triggers:
3752
branches:
3853
only:
@@ -43,3 +58,22 @@ platforms:
4358
- "upm-ci~/test-results/**/*"
4459
{% endfor %}
4560
{% endfor %}
61+
62+
publish:
63+
name: Publish to Internal Registry
64+
agent:
65+
type: Unity::VM
66+
image: package-ci/win10:stable
67+
flavor: m1.large
68+
commands:
69+
- npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
70+
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
71+
- upm-ci package publish --package-path ./Packages/com.unity.inputsystem/
72+
triggers:
73+
tags:
74+
only:
75+
- /^(r|R)(c|C)-\d+\.\d+\.\d+(-preview(\.\d+)?)?$/
76+
artifacts:
77+
artifacts:
78+
paths:
79+
- "upm-ci~/packages/*.tgz"

0 commit comments

Comments
 (0)