Skip to content

Commit bc8b5e8

Browse files
andrew-ocandrew-oc
committed
Merge branch 'develop' into stable
# Conflicts: # .yamato/promotion.yml # .yamato/upm-ci.yml
2 parents 6bf32ba + f91d687 commit bc8b5e8

File tree

417 files changed

+23165
-17078
lines changed

Some content is hidden

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

417 files changed

+23165
-17078
lines changed

‎.gitattributes‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# by convention everything should be LF
2+
* text eol=lf
3+
4+
# VS can handle these as LF, but really wants them as CRLF
5+
*.vcproj text eol=crlf
6+
*.vcxproj text eol=crlf
7+
*.vcxproj.filters text eol=crlf
8+
*.csproj text eol=crlf
9+
*.props text eol=crlf
10+
*.targets text eol=crlf
11+
*.sln text eol=crlf
12+
*.sln.template text eol=crlf
13+
*.bat text eol=crlf
14+
*.cmd text eol=crlf
15+
*.xaml text eol=crlf
16+
17+
*.dll binary
18+
*.exe binary
19+
*.pdb binary
20+
*.png binary
21+
*.jpg binary
22+
*.exr binary
23+
*.ttf binary
24+
*.pdf binary
25+
*.xcf binary
26+
*.ico binary

‎.gitconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[core]
2+
autocrlf=false

‎.repoconfig‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[version]
2+
repoconfig = 5
3+
4+
[format]
5+
path-ignore=<<EOT
6+
^(
7+
Packages/com\.unity\.package-manager-doctools
8+
|Tools/CodeAnalyzerTestProject
9+
)/
10+
EOT

‎.yamato/analyze.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
code_analyser:
2-
name : Code Analyzer
3-
agent:
4-
type: Unity::VM::osx
5-
image: package-ci/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://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
13-
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
14-
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2019.4
15-
triggers:
16-
cancel_old_ci: true
17-
pull_requests:
18-
- targets:
19-
only:
20-
- "develop"
21-
artifacts:
22-
UTR_Output.zip:
23-
paths:
24-
- "upm-ci~/test-results/**/*"
1+
code_analyser:
2+
name : Code Analyzer
3+
agent:
4+
type: Unity::VM::osx
5+
image: package-ci/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://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
13+
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
14+
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2019.4
15+
triggers:
16+
cancel_old_ci: true
17+
pull_requests:
18+
- targets:
19+
only:
20+
- "develop"
21+
artifacts:
22+
UTR_Output.zip:
23+
paths:
24+
- "upm-ci~/test-results/**/*"

‎.yamato/format.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
check_formatting:
2-
name : Check formatting
3-
agent:
4-
type: Unity::VM::osx
5-
image: desktop/desktop-macos-10.14:latest
6-
flavor: m1.mac
7-
commands:
8-
- hg clone -b stable http://hg-mirror-slo.hq.unity3d.com/unity-extra/unity-meta
9-
- perl unity-meta/Tools/Format/format.pl Assets Packages --dry-run
10-
triggers:
11-
cancel_old_ci: true
12-
pull_requests:
13-
- targets:
14-
only:
15-
- "develop"
1+
check_formatting:
2+
name : Check formatting
3+
agent:
4+
type: Unity::VM::osx
5+
image: desktop/desktop-macos-10.14:latest
6+
flavor: m1.mac
7+
commands:
8+
- hg clone -b stable http://hg-mirror-slo.hq.unity3d.com/unity-extra/unity-meta
9+
- perl unity-meta/Tools/Format/format.pl Assets Packages --dry-run
10+
triggers:
11+
cancel_old_ci: true
12+
pull_requests:
13+
- targets:
14+
only:
15+
- "develop"

‎.yamato/promotion.yml‎

Lines changed: 23 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,23 @@
1-
{% metadata_file .yamato/config.metadata %}
2-
---
3-
4-
{% for editor in editors %}
5-
{% for platform in platforms %}
6-
promotion_test_{{ platform.name }}_{{ editor.version }}:
7-
name: Promotion Test {{ editor.version }} on {{ platform.name }}
8-
agent:
9-
type: {{ platform.type }}
10-
image: {{ platform.image }}
11-
flavor: {{ platform.flavor}}
12-
variables:
13-
UPMCI_PROMOTION: 1
14-
commands:
15-
- mv ./Assets/Samples ./Packages/com.unity.inputsystem
16-
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
17-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
18-
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
19-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
20-
{% if platform.installscript %}
21-
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
22-
- {{ platform.installscript }} {{ editor.version }}
23-
{% endif %}
24-
- 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 %}
25-
artifacts:
26-
logs:
27-
paths:
28-
- "upm-ci~/test-results/**/*"
29-
{% endfor %}
30-
{% endfor %}
31-
32-
promote:
33-
name: Promote to Production
34-
agent:
35-
type: Unity::VM
36-
image: package-ci/win10:stable
37-
flavor: b1.large
38-
variables:
39-
UPMCI_PROMOTION: 1
40-
commands:
41-
- mv ./Assets/Samples ./Packages/com.unity.inputsystem
42-
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
43-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
44-
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
45-
- upm-ci package promote --package-path ./Packages/com.unity.inputsystem/
46-
artifacts:
47-
artifacts:
48-
paths:
49-
- "upm-ci~/**/*"
50-
dependencies:
51-
{% for editor in editors %}
52-
{% for platform in platforms %}
53-
- .yamato/promotion.yml#promotion_test_{{ platform.name }}_{{ editor.version }}
54-
{% endfor %}
55-
{% endfor %}
1+
{% metadata_file .yamato/config.metadata %}
2+
---
3+
promote:
4+
name: Promote to Production
5+
agent:
6+
type: Unity::VM
7+
image: package-ci/win10:stable
8+
flavor: b1.large
9+
variables:
10+
UPMCI_PROMOTION: 1
11+
commands:
12+
- mv ./Assets/Samples ./Packages/com.unity.inputsystem
13+
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
14+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
15+
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
16+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
17+
- upm-ci package promote --package-path ./Packages/com.unity.inputsystem/
18+
artifacts:
19+
artifacts:
20+
paths:
21+
- "upm-ci~/**/*"
22+
dependencies:
23+
- .yamato/publish-samples.yml

‎.yamato/publish-samples.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
test_sample_projects:
2-
name : Publish Sample Projects
3-
agent:
4-
type: Unity::VM::osx
5-
image: package-ci/mac:stable
6-
flavor: m1.mac
7-
commands:
8-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
9-
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
10-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
11-
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=Publish sh ExternalSampleProjects/publish.sh
12-
artifacts:
13-
UTR_Output.zip:
14-
paths:
15-
- "upm-ci~/**/*"
1+
test_sample_projects:
2+
name : Publish Sample Projects
3+
agent:
4+
type: Unity::VM::osx
5+
image: package-ci/mac:stable
6+
flavor: m1.mac
7+
commands:
8+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
9+
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
10+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
11+
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=Publish sh ExternalSampleProjects/publish.sh
12+
artifacts:
13+
UTR_Output.zip:
14+
paths:
15+
- "upm-ci~/**/*"

‎.yamato/test-samples.yml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
{% metadata_file .yamato/config.metadata %}
2-
---
3-
{% for editor in editors %}
4-
test_sample_projects_{{ editor.version }}:
5-
name : Test Sample Projects {{ editor.version }}
6-
agent:
7-
type: Unity::VM::osx
8-
image: package-ci/mac:stable
9-
flavor: m1.mac
10-
commands:
11-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
12-
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
13-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
14-
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=DryRun sh ExternalSampleProjects/publish.sh
15-
triggers:
16-
cancel_old_ci: true
17-
pull_requests:
18-
- targets:
19-
only:
20-
- "develop"
21-
artifacts:
22-
UTR_Output.zip:
23-
paths:
24-
- "upm-ci~/**/*"
1+
{% metadata_file .yamato/config.metadata %}
2+
---
3+
{% for editor in editors %}
4+
test_sample_projects_{{ editor.version }}:
5+
name : Test Sample Projects {{ editor.version }}
6+
agent:
7+
type: Unity::VM::osx
8+
image: package-ci/mac:stable
9+
flavor: m1.mac
10+
commands:
11+
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
12+
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
13+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
14+
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=DryRun sh ExternalSampleProjects/publish.sh
15+
triggers:
16+
cancel_old_ci: true
17+
pull_requests:
18+
- targets:
19+
only:
20+
- "develop"
21+
artifacts:
22+
UTR_Output.zip:
23+
paths:
24+
- "upm-ci~/**/*"
2525
{% endfor %}

0 commit comments

Comments
 (0)