Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .yamato/config.metadata
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@ platforms_nix:
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
- name: linux
type: Unity::VM
image: package-ci/ubuntu-20.04:v4
image: package-ci/ubuntu-22.04:v4
flavor: b1.large
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
- name: linux_standalone
type: Unity::VM
image: package-ci/ubuntu-20.04:v4
image: package-ci/ubuntu-22.04:v4
flavor: b1.large
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
runtime: StandaloneLinux64
- name: linux_standalone_il2cpp
type: Unity::VM
image: package-ci/ubuntu-20.04:v4
image: package-ci/ubuntu-22.04:v4
flavor: b1.large
instabilities_run: sh ./run_standalone_instability_detection-latest.sh ubuntu 0.5.1 || exit 0
runtime: StandaloneLinux64
Expand Down
2 changes: 1 addition & 1 deletion .yamato/wrench/api-validation-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ all_api_validation_jobs:
api_validation_-_inputsystem_-_2021_3_-_windows:
name: API Validation - inputsystem - 2021.3 - windows
agent:
image: package-ci/win10:v4
image: package-ci/win10:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/wrench/package-pack-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package_pack_-_inputsystem:
name: Package Pack - inputsystem
agent:
image: package-ci/ubuntu-20.04:v4
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down
12 changes: 6 additions & 6 deletions .yamato/wrench/preview-a-p-v.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ preview_apv_-_2021_3_-_macos:
preview_apv_-_2021_3_-_ubuntu:
name: Preview APV - 2021.3 - ubuntu
agent:
image: package-ci/ubuntu-20.04:default
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -248,7 +248,7 @@ preview_apv_-_2022_3_-_macos:
preview_apv_-_2022_3_-_ubuntu:
name: Preview APV - 2022.3 - ubuntu
agent:
image: package-ci/ubuntu-20.04:default
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -411,7 +411,7 @@ preview_apv_-_6000_0_-_macos:
preview_apv_-_6000_0_-_ubuntu:
name: Preview APV - 6000.0 - ubuntu
agent:
image: package-ci/ubuntu-20.04:default
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -574,7 +574,7 @@ preview_apv_-_6000_1_-_macos:
preview_apv_-_6000_1_-_ubuntu:
name: Preview APV - 6000.1 - ubuntu
agent:
image: package-ci/ubuntu-20.04:default
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -737,7 +737,7 @@ preview_apv_-_6000_2_-_macos:
preview_apv_-_6000_2_-_ubuntu:
name: Preview APV - 6000.2 - ubuntu
agent:
image: package-ci/ubuntu-20.04:default
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -900,7 +900,7 @@ preview_apv_-_6000_3_-_macos:
preview_apv_-_6000_3_-_ubuntu:
name: Preview APV - 6000.3 - ubuntu
agent:
image: package-ci/ubuntu-20.04:default
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down
4 changes: 2 additions & 2 deletions .yamato/wrench/promotion-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
publish_dry_run_inputsystem:
name: Publish Dry Run inputsystem
agent:
image: package-ci/ubuntu-20.04:default
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -217,7 +217,7 @@ publish_dry_run_inputsystem:
publish_inputsystem:
name: Publish inputsystem
agent:
image: package-ci/ubuntu-20.04:default
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/wrench/recipe-regeneration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
test_-_wrench_jobs_up_to_date:
name: Test - Wrench Jobs up to date
agent:
image: package-ci/ubuntu-20.04:default
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down
36 changes: 18 additions & 18 deletions .yamato/wrench/validation-jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
validate_-_inputsystem_-_2021_3_-_macos:
name: Validate - inputsystem - 2021.3 - macos
agent:
image: package-ci/macos-13:v4
image: package-ci/macos-13:default
type: Unity::VM::osx
flavor: b1.xlarge
commands:
Expand Down Expand Up @@ -71,7 +71,7 @@ validate_-_inputsystem_-_2021_3_-_macos:
validate_-_inputsystem_-_2021_3_-_ubuntu:
name: Validate - inputsystem - 2021.3 - ubuntu
agent:
image: package-ci/ubuntu-20.04:v4
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -137,7 +137,7 @@ validate_-_inputsystem_-_2021_3_-_ubuntu:
validate_-_inputsystem_-_2021_3_-_windows:
name: Validate - inputsystem - 2021.3 - windows
agent:
image: package-ci/win10:v4
image: package-ci/win10:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -203,7 +203,7 @@ validate_-_inputsystem_-_2021_3_-_windows:
validate_-_inputsystem_-_2022_3_-_macos:
name: Validate - inputsystem - 2022.3 - macos
agent:
image: package-ci/macos-13:v4
image: package-ci/macos-13:default
type: Unity::VM::osx
flavor: b1.xlarge
commands:
Expand Down Expand Up @@ -269,7 +269,7 @@ validate_-_inputsystem_-_2022_3_-_macos:
validate_-_inputsystem_-_2022_3_-_ubuntu:
name: Validate - inputsystem - 2022.3 - ubuntu
agent:
image: package-ci/ubuntu-20.04:v4
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -335,7 +335,7 @@ validate_-_inputsystem_-_2022_3_-_ubuntu:
validate_-_inputsystem_-_2022_3_-_windows:
name: Validate - inputsystem - 2022.3 - windows
agent:
image: package-ci/win10:v4
image: package-ci/win10:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -401,7 +401,7 @@ validate_-_inputsystem_-_2022_3_-_windows:
validate_-_inputsystem_-_6000_0_-_macos:
name: Validate - inputsystem - 6000.0 - macos
agent:
image: package-ci/macos-13:v4
image: package-ci/macos-13:default
type: Unity::VM::osx
flavor: b1.xlarge
commands:
Expand Down Expand Up @@ -467,7 +467,7 @@ validate_-_inputsystem_-_6000_0_-_macos:
validate_-_inputsystem_-_6000_0_-_ubuntu:
name: Validate - inputsystem - 6000.0 - ubuntu
agent:
image: package-ci/ubuntu-20.04:v4
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -533,7 +533,7 @@ validate_-_inputsystem_-_6000_0_-_ubuntu:
validate_-_inputsystem_-_6000_0_-_windows:
name: Validate - inputsystem - 6000.0 - windows
agent:
image: package-ci/win10:v4
image: package-ci/win10:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -599,7 +599,7 @@ validate_-_inputsystem_-_6000_0_-_windows:
validate_-_inputsystem_-_6000_1_-_macos:
name: Validate - inputsystem - 6000.1 - macos
agent:
image: package-ci/macos-13:v4
image: package-ci/macos-13:default
type: Unity::VM::osx
flavor: b1.xlarge
commands:
Expand Down Expand Up @@ -665,7 +665,7 @@ validate_-_inputsystem_-_6000_1_-_macos:
validate_-_inputsystem_-_6000_1_-_ubuntu:
name: Validate - inputsystem - 6000.1 - ubuntu
agent:
image: package-ci/ubuntu-20.04:v4
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -731,7 +731,7 @@ validate_-_inputsystem_-_6000_1_-_ubuntu:
validate_-_inputsystem_-_6000_1_-_windows:
name: Validate - inputsystem - 6000.1 - windows
agent:
image: package-ci/win10:v4
image: package-ci/win10:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -797,7 +797,7 @@ validate_-_inputsystem_-_6000_1_-_windows:
validate_-_inputsystem_-_6000_2_-_macos:
name: Validate - inputsystem - 6000.2 - macos
agent:
image: package-ci/macos-13:v4
image: package-ci/macos-13:default
type: Unity::VM::osx
flavor: b1.xlarge
commands:
Expand Down Expand Up @@ -863,7 +863,7 @@ validate_-_inputsystem_-_6000_2_-_macos:
validate_-_inputsystem_-_6000_2_-_ubuntu:
name: Validate - inputsystem - 6000.2 - ubuntu
agent:
image: package-ci/ubuntu-20.04:v4
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -929,7 +929,7 @@ validate_-_inputsystem_-_6000_2_-_ubuntu:
validate_-_inputsystem_-_6000_2_-_windows:
name: Validate - inputsystem - 6000.2 - windows
agent:
image: package-ci/win10:v4
image: package-ci/win10:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -995,7 +995,7 @@ validate_-_inputsystem_-_6000_2_-_windows:
validate_-_inputsystem_-_6000_3_-_macos:
name: Validate - inputsystem - 6000.3 - macos
agent:
image: package-ci/macos-13:v4
image: package-ci/macos-13:default
type: Unity::VM::osx
flavor: b1.xlarge
commands:
Expand Down Expand Up @@ -1061,7 +1061,7 @@ validate_-_inputsystem_-_6000_3_-_macos:
validate_-_inputsystem_-_6000_3_-_ubuntu:
name: Validate - inputsystem - 6000.3 - ubuntu
agent:
image: package-ci/ubuntu-20.04:v4
image: package-ci/ubuntu-22.04:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down Expand Up @@ -1127,7 +1127,7 @@ validate_-_inputsystem_-_6000_3_-_ubuntu:
validate_-_inputsystem_-_6000_3_-_windows:
name: Validate - inputsystem - 6000.3 - windows
agent:
image: package-ci/win10:v4
image: package-ci/win10:default
type: Unity::VM
flavor: b1.large
commands:
Expand Down
9 changes: 5 additions & 4 deletions Tools/CI/Settings/InputSystemSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ public InputSystemSettings()
wrenchCsProjectPath: "/Tools/CI/InputSystem.Cookbook.csproj",
useLocalPvpExemptions: true
);

// change default images as per Dictionary above.
Wrench.Packages["com.unity.inputsystem"].EditorPlatforms = ImageOverrides;


var defaultUbuntuPlatform = WrenchPackage.DefaultEditorPlatforms[SystemType.Ubuntu];
// Use Ubuntu image package-ci/ubuntu-22.04.
Wrench.Packages["com.unity.inputsystem"].EditorPlatforms[SystemType.Ubuntu] = new Platform(new Agent("package-ci/ubuntu-22.04:default", defaultUbuntuPlatform.Agent.Flavor, defaultUbuntuPlatform.Agent.Resource), defaultUbuntuPlatform.System);

// ignore packages listed below in PreviewAPV
Wrench.Packages["com.unity.inputsystem"].DependantsToIgnoreInPreviewApv = new Dictionary<Editor, ISet<string>>()
{
Expand Down