diff --git a/.yamato/format.yml b/.yamato/format.yml index 4842f258..52b5aea0 100644 --- a/.yamato/format.yml +++ b/.yamato/format.yml @@ -8,7 +8,3 @@ check_formatting: - git clone --branch stable git@github.cds.internal.unity3d.com:unity/unity-meta.git --no-checkout - git -C unity-meta checkout 6f6dd71b42f7fd3294032a6c89b1402ef3e46099 - perl unity-meta/Tools/Format/format.pl --dry-run com.unity.mobile.android-logcat/Editor com.unity.mobile.android-logcat/Tests TestProjects - triggers: - branches: - only: - - "/.*/" diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index a8f417d9..f8f63045 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -66,6 +66,7 @@ test_all_trigger: only: - "master" dependencies: + - .yamato/format.yml#check_formatting - .yamato/wrench/package-pack-jobs.yml#package_pack_-_mobile_android-logcat {% for editor in test_editors %} - .yamato/upm-integration-ci.yml#test_integration_{{ editor.version }} diff --git a/.yamato/wrench/package-pack-jobs.yml b/.yamato/wrench/package-pack-jobs.yml index e7d01a39..e891afa1 100644 --- a/.yamato/wrench/package-pack-jobs.yml +++ b/.yamato/wrench/package-pack-jobs.yml @@ -25,8 +25,6 @@ package_pack_-_mobile_android-logcat: packages: paths: - upm-ci~/packages/**/* - dependencies: - - path: .yamato/format.yml#check_formatting variables: UPMCI_ACK_LARGE_PACKAGE: 1 WRENCH_LOCALAPV_URL: https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-18_814805bc36916a15e7c4fffd9156635086c96203ca783d5e2fb2e47f160d4eca.zip diff --git a/Tools/CI/Settings/UnityMobileLogcatSettings.cs b/Tools/CI/Settings/UnityMobileLogcatSettings.cs index dcfa63ed..ec22088b 100644 --- a/Tools/CI/Settings/UnityMobileLogcatSettings.cs +++ b/Tools/CI/Settings/UnityMobileLogcatSettings.cs @@ -20,13 +20,6 @@ public class UnityMobileLogcatSettings : AnnotatedSettingsBase { IsReleasing = true }, - PackJobOptions = new PackJobOptions() - { - Dependencies = new List() - { - new("format", "check_formatting") - } - }, CustomChecks = new HashSet() { new Dependency("upm-ci", "test_all_trigger")