Skip to content

Commit 287f2d1

Browse files
committed
Merge branch 'develop' into release/1.X
2 parents 027f642 + ec362e6 commit 287f2d1

File tree

167 files changed

+27118
-3737
lines changed

Some content is hidden

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

167 files changed

+27118
-3737
lines changed

.yamato/PVPexemptions.json

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

.yamato/config.metadata

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ editors:
44
run_tvos: false
55
- version: 6000.0
66
run_tvos: false
7-
- version: 6000.1
8-
run_tvos: false
97
- version: 6000.2
108
run_tvos: false
119
- version: trunk
10+
run_ios_15: true
1211
run_tvos: false
1312

1413
utr_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
@@ -57,18 +56,18 @@ platforms_nix:
5756
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
5857
- name: linux
5958
type: Unity::VM
60-
image: package-ci/ubuntu-20.04:v4
59+
image: package-ci/ubuntu-22.04:v4
6160
flavor: b1.large
6261
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
6362
- name: linux_standalone
6463
type: Unity::VM
65-
image: package-ci/ubuntu-20.04:v4
64+
image: package-ci/ubuntu-22.04:v4
6665
flavor: b1.large
6766
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
6867
runtime: StandaloneLinux64
6968
- name: linux_standalone_il2cpp
7069
type: Unity::VM
71-
image: package-ci/ubuntu-20.04:v4
70+
image: package-ci/ubuntu-22.04:v4
7271
flavor: b1.large
7372
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
7473
runtime: StandaloneLinux64

.yamato/input-system-editor-functional-tests.yml

Lines changed: 332 additions & 0 deletions
Large diffs are not rendered by default.

.yamato/input-system-editor-performance-tests.yml

Lines changed: 332 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)