Skip to content

Commit eb5279b

Browse files
author
Dmytro Ivanov
committed
Merge branch 'develop' into stable
2 parents 59db7b7 + c7792d5 commit eb5279b

175 files changed

Lines changed: 12567 additions & 1595 deletions

File tree

Some content is hidden

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

‎.yamato/analyze.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1+
{% metadata_file .yamato/config.metadata %}
2+
---
3+
14
code_analyser:
25
name : Code Analyzer
36
agent:
47
type: Unity::VM::osx
5-
image: package-ci/mac:stable
8+
image: package-ci/macos-12:default
69
flavor: m1.mac
710
commands:
811
- git submodule update --init
912
- mkdir Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
1013
- 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
1114
- 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
15+
- {{ upm_ci_install }}
1316
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
1417
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2019.4
1518
triggers:

‎.yamato/config.metadata‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,47 @@
11
editors:
2-
- version: 2019.4
32
- version: 2020.3
4-
- version: 2021.2
3+
disable_tvos_run: true
4+
- version: 2021.3
5+
- version: 2022.2
56
- version: trunk
6-
platforms:
7+
8+
utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
9+
utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
10+
11+
unity_downloader_install: pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
12+
13+
upm_ci_install: npm install -g upm-ci-utils@stable --registry https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-npm
14+
15+
platforms_win:
716
- name: win
817
type: Unity::VM
9-
image: package-ci/win10:v1.15.0-713263
18+
image: package-ci/win10:default
1019
flavor: b1.large
11-
netinstall: choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local
1220
- name: win_standalone
1321
type: Unity::VM
14-
image: package-ci/win10:v1.15.0-713263
22+
image: package-ci/win10:default
1523
flavor: b1.large
1624
runtime: StandaloneWindows64
17-
netinstall: choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local
1825
- name: win_standalone_il2cpp
1926
type: Unity::VM
20-
image: package-ci/win10:v1.15.0-713263
27+
image: package-ci/win10:default
2128
flavor: b1.large
2229
runtime: StandaloneWindows64
2330
scripting-backend: Il2Cpp
2431
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP -w -u
25-
netinstall: choco install netfx-4.7.1-devpack -y --ignore-detected-reboot --ignore-package-codes --Source https://bfartifactory.bf.unity3d.com/artifactory/api/nuget/unity-choco-local
32+
platforms_nix:
2633
- name: mac
2734
type: Unity::VM::osx
28-
image: package-ci/macos-12:latest
35+
image: package-ci/macos-12:default
2936
flavor: m1.mac
3037
- name: mac_standalone
3138
type: Unity::VM::osx
32-
image: package-ci/macos-12:latest
39+
image: package-ci/macos-12:default
3340
flavor: m1.mac
3441
runtime: StandaloneOSX
3542
- name: mac_standalone_il2cpp
3643
type: Unity::VM::osx
37-
image: package-ci/macos-12:latest
44+
image: package-ci/macos-12:default
3845
flavor: m1.mac
3946
runtime: StandaloneOSX
4047
scripting-backend: Il2Cpp

‎.yamato/format.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
{% metadata_file .yamato/config.metadata %}
2+
---
3+
14
check_formatting:
25
name : Check formatting
36
agent:
47
type: Unity::VM::osx
5-
image: package-ci/mac:latest
8+
image: package-ci/macos-12:default
69
flavor: m1.mac
710
commands:
8-
- hg clone -b stable http://hg-mirror-slo.hq.unity3d.com/unity-extra/unity-meta
11+
- git clone git@github.cds.internal.unity3d.com:unity/unity-meta.git
912
- perl unity-meta/Tools/Format/format.pl Assets Packages --dry-run
1013
triggers:
1114
cancel_old_ci: true

‎.yamato/promotion.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
{% metadata_file .yamato/config.metadata %}
2+
---
3+
14
promote:
25
name: Promote to Production
36
agent:
47
type: Unity::VM
5-
image: package-ci/win10:stable
8+
image: package-ci/win10:default
69
flavor: b1.large
710
variables:
811
UPMCI_PROMOTION: 1
912
commands:
1013
- move /Y .\Assets\Samples .\Packages\com.unity.inputsystem
1114
- xcopy /Y /H .\Assets\Samples.meta .\Packages\com.unity.inputsystem
1215
- del /AH .\Assets\Samples.meta
13-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
16+
- {{ upm_ci_install }}
1417
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
1518
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
1619
- upm-ci package promote --package-path ./Packages/com.unity.inputsystem/

‎.yamato/publish-samples.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
{% metadata_file .yamato/config.metadata %}
2+
---
3+
14
test_sample_projects:
25
name : Publish Sample Projects
36
agent:
47
type: Unity::VM::osx
5-
image: package-ci/mac:stable
8+
image: package-ci/macos-12:default
69
flavor: m1.mac
710
commands:
8-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
11+
- {{ upm_ci_install }}
912
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
1013
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
1114
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=Publish sh ExternalSampleProjects/publish.sh

‎.yamato/sonarqube.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Sonarqube scanner job for the Input System Package
2+
Windows-Dotnet-SonarScanner:
3+
name: Dotnet Sonar Scanner Windows Input System
4+
agent:
5+
type: Unity::VM
6+
flavor: b1.large
7+
image: package-ci/win10-sonar:stable
8+
variables:
9+
EDITOR_VERSION: "2021.3"
10+
SONAR_HOST_URL: "https://sonar-staging.internal.unity3d.com"
11+
SONARQUBE_PROJECT_NAME: "SonarProject"
12+
SONAR_PROJECT_KEY: "input:com.unity.inputsystem"
13+
RIDER_VERSION: "3.0.12"
14+
commands:
15+
- |
16+
cd %YAMATO_WORK_DIR%
17+
unity-downloader-cli -u %EDITOR_VERSION% -c Editor --fast --wait
18+
- |
19+
unity-config project create %YAMATO_SOURCE_DIR%\%SONARQUBE_PROJECT_NAME%
20+
unity-config settings project-path %YAMATO_SOURCE_DIR%\%SONARQUBE_PROJECT_NAME%
21+
unity-config project add dependency com.unity.ide.rider@%RIDER_VERSION%
22+
move %YAMATO_SOURCE_DIR%\Packages\com.unity.inputsystem %YAMATO_SOURCE_DIR%\%SONARQUBE_PROJECT_NAME%\Packages\com.unity.inputsystem
23+
- start /W %YAMATO_WORK_DIR%\.Editor\Unity.exe -projectPath %YAMATO_SOURCE_DIR%\%SONARQUBE_PROJECT_NAME% -batchmode -quit -nographics -logFile %YAMATO_SOURCE_DIR%\%SONARQUBE_PROJECT_NAME%\Editor.log -executeMethod "Packages.Rider.Editor.RiderScriptEditor.SyncSolution"
24+
- |
25+
# If not triggered by a PR pass branch name, otherwise PR parameters
26+
IF "%YAMATO_PR_ID%" == "" ( set SONAR_ANALYSIS_TYPE_PARAM=/d:sonar.branch.name=%GIT_BRANCH% ) ELSE ( set SONAR_ANALYSIS_TYPE_PARAM=/d:sonar.pullrequest.key=%YAMATO_PR_ID% /d:sonar.pullrequest.branch=%GIT_BRANCH% /d:sonar.pullrequest.base=%YAMATO_PR_TARGET_BRANCH% )
27+
cmd /v /s /c "dotnet sonarscanner begin /k:"%SONAR_PROJECT_KEY%" /d:sonar.login=!SONAR_TOKEN_STAGING! /d:sonar.host.url=%SONAR_HOST_URL% /d:sonar.projectBaseDir=%YAMATO_SOURCE_DIR%\%SONARQUBE_PROJECT_NAME%\Packages\com.unity.inputsystem /d:sonar.sourceEncoding="UTF-8" %SONAR_ANALYSIS_TYPE_PARAM% /d:sonar.scm.provider=git /d:sonar.log.level=DEBUG /d:sonar.verbose=true /d:sonar.qualitygate.wait=true"
28+
dotnet build %YAMATO_SOURCE_DIR%\%SONARQUBE_PROJECT_NAME%\%SONARQUBE_PROJECT_NAME%.sln /t:Rebuild /p:SonarQubeTestProject=false
29+
cmd /v /s /c "dotnet sonarscanner end /d:sonar.login=!SONAR_TOKEN_STAGING!"
30+
artifacts:
31+
logs:
32+
paths:
33+
- "**/*.log"
34+
triggers:
35+
pull_requests:
36+
- targets:
37+
only:
38+
- "develop"

‎.yamato/test-samples.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ test_sample_projects_{{ editor.version }}:
55
name : Test Sample Projects {{ editor.version }}
66
agent:
77
type: Unity::VM::osx
8-
image: package-ci/mac:stable
8+
image: package-ci/macos-12:default
99
flavor: m1.mac
1010
commands:
11-
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
11+
- {{ upm_ci_install }}
1212
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
1313
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
1414
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=DryRun sh ExternalSampleProjects/publish.sh

0 commit comments

Comments
 (0)