From bb75488ad0a26e26d62178334a39d3316ed0dd92 Mon Sep 17 00:00:00 2001 From: dkijania Date: Wed, 20 Sep 2023 17:15:36 +0200 Subject: [PATCH 1/2] removing if statement for running tests on develop and compatible --- buildkite/src/Command/TestExecutive.dhall | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/buildkite/src/Command/TestExecutive.dhall b/buildkite/src/Command/TestExecutive.dhall index 2f9b3e14092..1a94ac3945b 100644 --- a/buildkite/src/Command/TestExecutive.dhall +++ b/buildkite/src/Command/TestExecutive.dhall @@ -33,8 +33,7 @@ in ], label = "Build test-executive", key = "build-test-executive", - target = Size.XLarge, - `if` = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'" + target = Size.XLarge }, execute = \(testName : Text) -> \(dependsOn : List Command.TaggedKey.Type) -> @@ -53,8 +52,7 @@ in label = "${testName} integration test", key = "integration-test-${testName}", target = Size.Integration, - depends_on = dependsOn, - `if` = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'" + depends_on = dependsOn }, buildJs = \(duneProfile : Text) -> @@ -72,8 +70,7 @@ in ], label = "Build JS integration tests", key = "build-js-tests", - target = Size.XLarge, - `if` = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'" + target = Size.XLarge }, executeWithJs = \(testName : Text) -> \(dependsOn : List Command.TaggedKey.Type) -> @@ -93,8 +90,7 @@ in label = "${testName} integration test", key = "integration-test-${testName}", target = Size.Integration, - depends_on = dependsOn, - `if` = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'", + depends_on = dependsOn soft_fail = Some (B/SoftFail.Boolean True) } } From b52bb50a353786f5ec59937e8b04a02a766e2c45 Mon Sep 17 00:00:00 2001 From: dkijania Date: Wed, 20 Sep 2023 17:22:52 +0200 Subject: [PATCH 2/2] fix comp issues --- buildkite/src/Command/TestExecutive.dhall | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildkite/src/Command/TestExecutive.dhall b/buildkite/src/Command/TestExecutive.dhall index 1a94ac3945b..8e7eaa2b164 100644 --- a/buildkite/src/Command/TestExecutive.dhall +++ b/buildkite/src/Command/TestExecutive.dhall @@ -90,7 +90,7 @@ in label = "${testName} integration test", key = "integration-test-${testName}", target = Size.Integration, - depends_on = dependsOn + depends_on = dependsOn, soft_fail = Some (B/SoftFail.Boolean True) } }