Skip to content

Commit

Permalink
FIX: Inconsistent line endings in repo (#1244).
Browse files Browse the repository at this point in the history
  • Loading branch information
jimon authored Dec 2, 2020
1 parent 35ec3e5 commit ccf7193
Show file tree
Hide file tree
Showing 314 changed files with 11,398 additions and 11,363 deletions.
26 changes: 26 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# by convention everything should be LF
* text eol=lf

# VS can handle these as LF, but really wants them as CRLF
*.vcproj text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf
*.csproj text eol=crlf
*.props text eol=crlf
*.targets text eol=crlf
*.sln text eol=crlf
*.sln.template text eol=crlf
*.bat text eol=crlf
*.cmd text eol=crlf
*.xaml text eol=crlf

*.dll binary
*.exe binary
*.pdb binary
*.png binary
*.jpg binary
*.exr binary
*.ttf binary
*.pdf binary
*.xcf binary
*.ico binary
2 changes: 2 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[core]
autocrlf=false
10 changes: 10 additions & 0 deletions .repoconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[version]
repoconfig = 5

[format]
path-ignore=<<EOT
^(
Packages/com\.unity\.package-manager-doctools
|Tools/CodeAnalyzerTestProject
)/
EOT
48 changes: 24 additions & 24 deletions .yamato/analyze.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
code_analyser:
name : Code Analyzer
agent:
type: Unity::VM::osx
image: package-ci/mac:stable
flavor: m1.mac
commands:
- git submodule update --init
- mkdir Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
- 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
- unzip Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.zip -d Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2019.4
triggers:
cancel_old_ci: true
pull_requests:
- targets:
only:
- "develop"
artifacts:
UTR_Output.zip:
paths:
- "upm-ci~/test-results/**/*"
code_analyser:
name : Code Analyzer
agent:
type: Unity::VM::osx
image: package-ci/mac:stable
flavor: m1.mac
commands:
- git submodule update --init
- mkdir Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
- 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
- unzip Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.zip -d Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2019.4
triggers:
cancel_old_ci: true
pull_requests:
- targets:
only:
- "develop"
artifacts:
UTR_Output.zip:
paths:
- "upm-ci~/test-results/**/*"
30 changes: 15 additions & 15 deletions .yamato/format.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
check_formatting:
name : Check formatting
agent:
type: Unity::VM::osx
image: desktop/desktop-macos-10.14:latest
flavor: m1.mac
commands:
- hg clone -b stable http://hg-mirror-slo.hq.unity3d.com/unity-extra/unity-meta
- perl unity-meta/Tools/Format/format.pl Assets Packages --dry-run
triggers:
cancel_old_ci: true
pull_requests:
- targets:
only:
- "develop"
check_formatting:
name : Check formatting
agent:
type: Unity::VM::osx
image: desktop/desktop-macos-10.14:latest
flavor: m1.mac
commands:
- hg clone -b stable http://hg-mirror-slo.hq.unity3d.com/unity-extra/unity-meta
- perl unity-meta/Tools/Format/format.pl Assets Packages --dry-run
triggers:
cancel_old_ci: true
pull_requests:
- targets:
only:
- "develop"
40 changes: 20 additions & 20 deletions .yamato/promotion.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
promote:
name: Promote to Production
agent:
type: Unity::VM
image: package-ci/win10:stable
flavor: b1.large
dependencies:
- .yamato/publish-samples.yml
variables:
UPMCI_PROMOTION: 1
commands:
- mv ./Assets/Samples ./Packages/com.unity.inputsystem
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
- upm-ci package promote --package-path ./Packages/com.unity.inputsystem/
artifacts:
artifacts:
paths:
- "upm-ci~/**/*"
promote:
name: Promote to Production
agent:
type: Unity::VM
image: package-ci/win10:stable
flavor: b1.large
dependencies:
- .yamato/publish-samples.yml
variables:
UPMCI_PROMOTION: 1
commands:
- mv ./Assets/Samples ./Packages/com.unity.inputsystem
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
- upm-ci package promote --package-path ./Packages/com.unity.inputsystem/
artifacts:
artifacts:
paths:
- "upm-ci~/**/*"
30 changes: 15 additions & 15 deletions .yamato/publish-samples.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
test_sample_projects:
name : Publish Sample Projects
agent:
type: Unity::VM::osx
image: package-ci/mac:stable
flavor: m1.mac
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=Publish sh ExternalSampleProjects/publish.sh
artifacts:
UTR_Output.zip:
paths:
- "upm-ci~/**/*"
test_sample_projects:
name : Publish Sample Projects
agent:
type: Unity::VM::osx
image: package-ci/mac:stable
flavor: m1.mac
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=Publish sh ExternalSampleProjects/publish.sh
artifacts:
UTR_Output.zip:
paths:
- "upm-ci~/**/*"
48 changes: 24 additions & 24 deletions .yamato/test-samples.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{% metadata_file .yamato/config.metadata %}
---
{% for editor in editors %}
test_sample_projects_{{ editor.version }}:
name : Test Sample Projects {{ editor.version }}
agent:
type: Unity::VM::osx
image: package-ci/mac:stable
flavor: m1.mac
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=DryRun sh ExternalSampleProjects/publish.sh
triggers:
cancel_old_ci: true
pull_requests:
- targets:
only:
- "develop"
artifacts:
UTR_Output.zip:
paths:
- "upm-ci~/**/*"
{% metadata_file .yamato/config.metadata %}
---
{% for editor in editors %}
test_sample_projects_{{ editor.version }}:
name : Test Sample Projects {{ editor.version }}
agent:
type: Unity::VM::osx
image: package-ci/mac:stable
flavor: m1.mac
commands:
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=DryRun sh ExternalSampleProjects/publish.sh
triggers:
cancel_old_ci: true
pull_requests:
- targets:
only:
- "develop"
artifacts:
UTR_Output.zip:
paths:
- "upm-ci~/**/*"
{% endfor %}
Loading

0 comments on commit ccf7193

Please sign in to comment.