Skip to content

Commit 2b09379

Browse files
authored
Merge branch 'develop' into ekcoh/profiler
2 parents faee8b2 + e8abd1c commit 2b09379

File tree

272 files changed

+27522
-3010
lines changed

Some content is hidden

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

272 files changed

+27522
-3010
lines changed

.github/codecov.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
codecov:
2+
max_report_age: false
3+
require_ci_to_pass: false
4+
notify:
5+
wait_for_ci: true
6+
7+
coverage:
8+
precision: 2
9+
round: down
10+
range: "50...70"
11+
status:
12+
patch:
13+
default:
14+
target: auto
15+
threshold: 1%
16+
base: auto
17+
if_ci_failed: success
18+
informational: true
19+
only_pulls: true
20+
default_rules:
21+
flag_coverage_not_uploaded_behavior: exclude
22+
project:
23+
default:
24+
target: auto
25+
threshold: 1%
26+
base: auto
27+
if_ci_failed: success
28+
informational: true
29+
only_pulls: true
30+
31+
comment:
32+
layout: "diff,flags,files"
33+
behavior: default
34+
require_changes: false
35+
require_base: true
36+
require_head: true
37+
after_n_builds: 1
38+
39+
flag_management:
40+
default_rules:
41+
carryforward: true

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,6 @@ Tools/CI/[Oo]bj
4949
.Editor
5050
.bin
5151
.download
52+
53+
!Tools/CI/InputSystem.Cookbook.csproj
54+
!Tools/CI/InputSystem-recipes.sln

.yamato/analyze.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@ 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 2019.4
17+
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2021.3
1818
triggers:
1919
cancel_old_ci: true
20-
pull_requests:
21-
- targets:
22-
only:
23-
- "develop"
20+
expression: pull_request.(target eq "develop" AND NOT changes.all match "**/*.md")
2421
artifacts:
2522
UTR_Output.zip:
2623
paths:

.yamato/config.metadata

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
editors:
2-
- version: 2021.3.45f
2+
- version: 2021.3
33
- version: 2022.3
4-
disable_tvos_run: true
4+
run_tvos: false
55
- version: 6000.0
6-
disable_tvos_run: true
6+
run_tvos: false
7+
- version: 6000.1
8+
run_tvos: false
9+
- version: 6000.2
10+
run_tvos: false
711
- version: trunk
8-
disable_tvos_run: true
12+
run_ios_15: true
13+
run_tvos: false
914

1015
utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
1116
utr_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
@@ -53,18 +58,18 @@ platforms_nix:
5358
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
5459
- name: linux
5560
type: Unity::VM
56-
image: package-ci/ubuntu-20.04:v4.50.0
61+
image: package-ci/ubuntu-22.04:v4
5762
flavor: b1.large
5863
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
5964
- name: linux_standalone
6065
type: Unity::VM
61-
image: package-ci/ubuntu-20.04:v4.50.0
66+
image: package-ci/ubuntu-22.04:v4
6267
flavor: b1.large
6368
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
6469
runtime: StandaloneLinux64
6570
- name: linux_standalone_il2cpp
6671
type: Unity::VM
67-
image: package-ci/ubuntu-20.04:v4.50.0
72+
image: package-ci/ubuntu-22.04:v4
6873
flavor: b1.large
6974
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
7075
runtime: StandaloneLinux64
@@ -74,11 +79,11 @@ scripting_backends:
7479
- name: mono
7580
- name: il2cpp
7681

77-
ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4.50.0
82+
ios_and_tvos_macos_bokken_image: package-ci/macos-13:v4
7883

7984
test_category:
8085
- name: performance
81-
- name: all
86+
- name: functional
8287

8388
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
8489
instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0

.yamato/format.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@ check_formatting:
1212
- perl unity-meta/Tools/Format/format.pl Assets Packages --dry-run
1313
triggers:
1414
cancel_old_ci: true
15-
pull_requests:
16-
- targets:
17-
only:
18-
- "develop"
15+
expression: pull_request.(target eq "develop" AND NOT changes.all match "**/*.md")
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
# This is an auto-generated script. Do not edit manually!
3+
set -x
4+
5+
set -e
6+
if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
7+
echo "removed existing archive infrastructure_instability_detection_standalone.zip"
8+
rm "infrastructure_instability_detection_standalone.zip" || true
9+
fi
10+
11+
if [ -d "infrastructure_instability_detection_standalone" ]; then
12+
echo "removed existing directory infrastructure_instability_detection_standalone/"
13+
rm -rf "infrastructure_instability_detection_standalone" || true
14+
fi
15+
16+
echo "downloading and extracting [email protected]"
17+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/ubuntu.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
18+
19+
if [ -d "infrastructure_instability_detection" ]; then
20+
echo "removing infrastructure_instability_detection folder to avoid name clash"
21+
rm -rf infrastructure_instability_detection/ || true
22+
fi
23+
24+
unzip -qo "infrastructure_instability_detection_standalone.zip" && rm "infrastructure_instability_detection_standalone.zip" || true
25+
26+
echo "downloading and extracting patterns"
27+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5 || true
28+
29+
if [ -d "patterns" ]; then
30+
echo "removing patterns folder to avoid name clash"
31+
rm -rf patterns/ || true
32+
fi
33+
34+
unzip -q patterns.zip && rm patterns.zip || true
35+
36+
echo "running '$(pwd)/infrastructure_instability_detection'"
37+
./infrastructure_instability_detection || true
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
# This is an auto-generated script. Do not edit manually!
3+
set -x
4+
5+
set -e
6+
if [ -f "infrastructure_instability_detection_standalone.zip" ]; then
7+
echo "removed existing archive infrastructure_instability_detection_standalone.zip"
8+
rm "infrastructure_instability_detection_standalone.zip" || true
9+
fi
10+
11+
if [ -d "infrastructure_instability_detection_standalone" ]; then
12+
echo "removed existing directory infrastructure_instability_detection_standalone/"
13+
rm -rf "infrastructure_instability_detection_standalone" || true
14+
fi
15+
16+
echo "downloading and extracting [email protected]"
17+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/1.0.0/macos.zip" --output "infrastructure_instability_detection_standalone.zip" --retry 5 || true
18+
19+
if [ -d "infrastructure_instability_detection" ]; then
20+
echo "removing infrastructure_instability_detection folder to avoid name clash"
21+
rm -rf infrastructure_instability_detection/ || true
22+
fi
23+
24+
unzip -qo "infrastructure_instability_detection_standalone.zip" && rm "infrastructure_instability_detection_standalone.zip" || true
25+
26+
echo "downloading and extracting patterns"
27+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5 || true
28+
29+
if [ -d "patterns" ]; then
30+
echo "removing patterns folder to avoid name clash"
31+
rm -rf patterns/ || true
32+
fi
33+
34+
unzip -q patterns.zip && rm patterns.zip || true
35+
36+
echo "running '$(pwd)/infrastructure_instability_detection'"
37+
./infrastructure_instability_detection || true
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@echo on
2+
rem This is an auto-generated script. Do not edit manually!
3+
4+
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
5+
IF EXIST "infrastructure_instability_detection" rmdir /s /q infrastructure_instability_detection
6+
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"
7+
curl -fs "https://artifactory-slo.bf.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/patterns.zip" --output patterns.zip --retry 5
8+
IF EXIST "patterns" rmdir /s /q patterns
9+
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('patterns.zip', '.'); }" && DEL "patterns.zip"
10+
infrastructure_instability_detection
11+
exit /b 0

.yamato/publish-samples.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ test_sample_projects:
1010
commands:
1111
- {{ upm_ci_install }}
1212
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
13-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2019.4
13+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u 2021.3
1414
- Editor=.Editor/Unity.app/Contents/MacOS/Unity Method=Publish sh ExternalSampleProjects/publish.sh
1515
artifacts:
1616
UTR_Output.zip:

.yamato/sonarqube.yml

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)