Skip to content

Commit e625ed9

Browse files
ekcohekcoh
authored
Merge branch 'develop' into isxb-699-trackedposedriver-fix
2 parents d6647bd + 2163cc1 commit e625ed9

File tree

160 files changed

+14732
-1693
lines changed

Some content is hidden

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

160 files changed

+14732
-1693
lines changed

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@ Packages/com.unity.inputsystem/**/*.api.meta
4343
Packages/com.unity.package-manager-ui/
4444
Packages/com.unity.package-manager-doctools/
4545

46+
Tools/CI/[Bb]in
47+
Tools/CI/[Oo]bj
48+
4649
.Editor
4750
.bin
4851
.download
52+
53+
!Tools/CI/InputSystem.Cookbook.csproj
54+
!Tools/CI/InputSystem-recipes.sln

‎.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 2019.4
17+
- upm-ci project test --project-path Tools/CodeAnalyzerTestProject -u 2021.3
1818
triggers:
1919
cancel_old_ci: true
2020
pull_requests:

‎.yamato/config.metadata‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
editors:
2-
- version: 2021.3.45f
2+
- version: 2021.3
33
- version: 2022.3
44
disable_tvos_run: true
55
- version: 6000.0
66
disable_tvos_run: true
7+
- version: 6000.1
8+
disable_tvos_run: true
79
- version: trunk
810
disable_tvos_run: true
911

@@ -17,35 +19,35 @@ upm_ci_install: npm install -g upm-ci-utils@stable --registry https://artifactor
1719
platforms_win:
1820
- name: win
1921
type: Unity::VM
20-
image: package-ci/win10:default
22+
image: package-ci/win10:v4
2123
flavor: b1.large
2224
- name: win_standalone
2325
type: Unity::VM
24-
image: package-ci/win10:default
26+
image: package-ci/win10:v4
2527
flavor: b1.large
2628
runtime: StandaloneWindows64
2729
- name: win_standalone_il2cpp
2830
type: Unity::VM
29-
image: package-ci/win10:default
31+
image: package-ci/win10:v4
3032
flavor: b1.large
3133
runtime: StandaloneWindows64
3234
scripting-backend: Il2Cpp
3335
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
3436
platforms_nix:
3537
- name: mac
3638
type: Unity::VM::osx
37-
image: package-ci/macos-13:default
39+
image: package-ci/macos-13:v4
3840
flavor: m1.mac
3941
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
4042
- name: mac_standalone
4143
type: Unity::VM::osx
42-
image: package-ci/macos-13:default
44+
image: package-ci/macos-13:v4
4345
flavor: m1.mac
4446
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
4547
runtime: StandaloneOSX
4648
- name: mac_standalone_il2cpp
4749
type: Unity::VM::osx
48-
image: package-ci/macos-13:default
50+
image: package-ci/macos-13:v4
4951
flavor: m1.mac
5052
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
5153
runtime: StandaloneOSX
@@ -84,4 +86,7 @@ instabilities_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifa
8486
instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0
8587

8688
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
87-
instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
89+
instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
90+
91+
yamato_source_dir_win: "%YAMATO_SOURCE_DIR%"
92+
yamato_source_dir_nix: ${YAMATO_SOURCE_DIR}

‎.yamato/generated-scripts/infrastructure-instability-detection-linux.sh‎

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

‎.yamato/generated-scripts/infrastructure-instability-detection-mac.sh‎

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

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

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/promotion.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ promote:
88
image: package-ci/win10:default
99
flavor: b1.large
1010
dependencies:
11-
- .yamato/publish-samples.yml
11+
- .yamato/publish-samples.yml#test_sample_projects
1212
variables:
1313
UPMCI_PROMOTION: 1
1414
commands:

‎.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:

0 commit comments

Comments
 (0)