Skip to content

Commit ea36b8b

Browse files
committed
Merge branch 'develop' into release/1.X
2 parents 58a055a + 14b6d6f commit ea36b8b

File tree

165 files changed

+5938
-3234
lines changed

Some content is hidden

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

165 files changed

+5938
-3234
lines changed

.yamato/analyze.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ code_analyser:
1414
- unzip Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers/Microsoft.CodeQuality.Analyzers.zip -d Tools/CodeAnalyzerTestProject/Microsoft.CodeQuality.Analyzers
1515
- {{ upm_ci_install }}
1616
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
17-
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2021.3
17+
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2022.3
1818
triggers:
1919
cancel_old_ci: true
2020
expression: pull_request.(target eq "develop" AND NOT changes.all match "**/*.md")

.yamato/config.metadata

Lines changed: 2 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,93 +1,9 @@
11
editors:
2-
- version: 2021.3
32
- version: 2022.3
4-
run_tvos: false
53
- version: 6000.0
6-
run_tvos: false
74
- version: 6000.2
8-
run_tvos: false
5+
- version: 6000.3
6+
- version: 6000.4
97
- version: trunk
10-
run_ios_15: true
11-
run_tvos: false
12-
13-
utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
14-
utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
15-
16-
unity_downloader_install: pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
178

189
upm_ci_install: npm install -g upm-ci-utils@stable --registry https://artifactory.prd.it.unity3d.com/artifactory/api/npm/upm-npm
19-
20-
platforms_win:
21-
- name: win
22-
type: Unity::VM
23-
image: package-ci/win10:v4
24-
flavor: b1.large
25-
- name: win_standalone
26-
type: Unity::VM
27-
image: package-ci/win10:v4
28-
flavor: b1.large
29-
runtime: StandaloneWindows64
30-
- name: win_standalone_il2cpp
31-
type: Unity::VM
32-
image: package-ci/win10:v4
33-
flavor: b1.large
34-
runtime: StandaloneWindows64
35-
scripting-backend: Il2Cpp
36-
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
37-
platforms_nix:
38-
- name: mac
39-
type: Unity::VM::osx
40-
image: package-ci/macos-13:v4
41-
flavor: m1.mac
42-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
43-
- name: mac_standalone
44-
type: Unity::VM::osx
45-
image: package-ci/macos-13:v4
46-
flavor: m1.mac
47-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
48-
runtime: StandaloneOSX
49-
- name: mac_standalone_il2cpp
50-
type: Unity::VM::osx
51-
image: package-ci/macos-13:v4
52-
flavor: m1.mac
53-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
54-
runtime: StandaloneOSX
55-
scripting-backend: Il2Cpp
56-
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
57-
- name: linux
58-
type: Unity::VM
59-
image: package-ci/ubuntu-22.04:v4
60-
flavor: b1.large
61-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
62-
- name: linux_standalone
63-
type: Unity::VM
64-
image: package-ci/ubuntu-22.04:v4
65-
flavor: b1.large
66-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
67-
runtime: StandaloneLinux64
68-
- name: linux_standalone_il2cpp
69-
type: Unity::VM
70-
image: package-ci/ubuntu-22.04:v4
71-
flavor: b1.large
72-
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
73-
runtime: StandaloneLinux64
74-
scripting-backend: Il2Cpp
75-
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
76-
scripting_backends:
77-
- name: mono
78-
- name: il2cpp
79-
80-
ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4
81-
82-
test_category:
83-
- name: performance
84-
- name: functional
85-
86-
instabilities_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.bat --output run_standalone_instability_detection-latest.bat --retry 5 || exit 0
87-
instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0
88-
89-
instabilities_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
90-
instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
91-
92-
yamato_source_dir_win: "%YAMATO_SOURCE_DIR%"
93-
yamato_source_dir_nix: ${YAMATO_SOURCE_DIR}

.yamato/generated-scripts/infrastructure-instability-detection-win.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
@echo on
22
rem This is an auto-generated script. Do not edit manually!
33

4+
if exist "%TEMP%\BugReporterCrashReportJson" for /f "delims=" %%i in ('dir /b /a-d "%TEMP%\BugReporterCrashReportJson\*.json"') do curl -X POST -H "Content-Type: application/json" -T "%TEMP%\BugReporterCrashReportJson\%%i" "https://internal-crash-collector.prd.cds.internal.unity3d.com/api/crash" || echo Failed to upload %%i. Ignoring...
45
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/windows.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5
56
IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
67
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('infrastructure_instability_detection_standalone.zip', '.'); }" && DEL "infrastructure_instability_detection_standalone.zip"

0 commit comments

Comments
 (0)