Skip to content

Commit 2d0177d

Browse files
committed
Trigger yamato checks on merge queue branch
1 parent 8103ab6 commit 2d0177d

File tree

4 files changed

+346
-342
lines changed

4 files changed

+346
-342
lines changed

.yamato/analyze.yml

+28-27
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
1-
#{% metadata_file .yamato/config.metadata %}
2-
#---
3-
#
4-
#code_analyser:
5-
# name : Code Analyzer
6-
# agent:
7-
# type: Unity::VM::osx
8-
# image: package-ci/macos-12:default
9-
# flavor: m1.mac
10-
# commands:
11-
# - git submodule update --init
12-
# - mkdir Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
13-
# - 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
14-
# - unzip Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.zip -d Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
15-
# - {{ upm_ci_install }}
16-
# - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
17-
# - upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2019.4
18-
# triggers:
19-
# cancel_old_ci: true
20-
# pull_requests:
21-
# - targets:
22-
# only:
23-
# - "develop"
24-
# artifacts:
25-
# UTR_Output.zip:
26-
# paths:
27-
# - "upm-ci~/test-results/**/*"
1+
{% metadata_file .yamato/config.metadata %}
2+
---
3+
4+
code_analyser:
5+
name : Code Analyzer
6+
agent:
7+
type: Unity::VM::osx
8+
image: package-ci/macos-12:default
9+
flavor: m1.mac
10+
commands:
11+
- git submodule update --init
12+
- mkdir Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
13+
- 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
14+
- unzip Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.zip -d Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
15+
- {{ upm_ci_install }}
16+
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
17+
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2019.4
18+
triggers:
19+
cancel_old_ci: true
20+
pull_requests:
21+
- targets:
22+
only:
23+
- "develop"
24+
- "gh-readonly-queue/{base_branch}"
25+
artifacts:
26+
UTR_Output.zip:
27+
paths:
28+
- "upm-ci~/test-results/**/*"

.yamato/sonarqube.yml

+39-38
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
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"
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"
39+
- "gh-readonly-queue/{base_branch}"

.yamato/test-samples.yml

+26-25
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
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/macos-12:default
9-
# flavor: m1.mac
10-
# commands:
11-
# - {{ upm_ci_install }}
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~/**/*"
25-
#{% endfor %}
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/macos-12:default
9+
flavor: m1.mac
10+
commands:
11+
- {{ upm_ci_install }}
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+
- "gh-readonly-queue/{base_branch}"
22+
artifacts:
23+
UTR_Output.zip:
24+
paths:
25+
- "upm-ci~/**/*"
26+
{% endfor %}

0 commit comments

Comments
 (0)