From 33c659f42a71a44babcf42f7611a7082dec0aa52 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Sun, 22 Jul 2018 17:12:15 -0400 Subject: [PATCH 1/4] jenkins: add selection for building on osx1011 --- jenkins/scripts/VersionSelectorScript.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 1d386bbf7..06ad20322 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -61,8 +61,11 @@ def buildExclusions = [ [ /sharedlibs_withoutssl/, anyType, lt(10) ], [ /sharedlibs_shared/, anyType, lt(9) ], - // ------------------------------------------------------- + // OSX --------------------------------------------------- + [ /^osx1010/, anyType, lt(11) ], + [ /^osx1011/, anyType, gte(11) ], + // ------------------------------------------------------- ] def canBuild = { nodeVersion, builderLabel, buildType -> From ddcd7281a9515ba936d31a1b6ad75e0fffe87f69 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Sun, 22 Jul 2018 17:53:53 -0400 Subject: [PATCH 2/4] squash: reverse selection --- jenkins/scripts/VersionSelectorScript.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 06ad20322..b4e66b5ba 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -62,8 +62,8 @@ def buildExclusions = [ [ /sharedlibs_shared/, anyType, lt(9) ], // OSX --------------------------------------------------- - [ /^osx1010/, anyType, lt(11) ], - [ /^osx1011/, anyType, gte(11) ], + [ /^osx1010/, anyType, gte(11) ], + [ /^osx1011/, anyType, lt(11) ], // ------------------------------------------------------- ] From 44b670b830da1ede2507c9500a0aeb05b0304eff Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Sun, 22 Jul 2018 17:58:12 -0400 Subject: [PATCH 3/4] squash: fix spacing --- jenkins/scripts/VersionSelectorScript.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index b4e66b5ba..938d016ad 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -62,8 +62,8 @@ def buildExclusions = [ [ /sharedlibs_shared/, anyType, lt(9) ], // OSX --------------------------------------------------- - [ /^osx1010/, anyType, gte(11) ], - [ /^osx1011/, anyType, lt(11) ], + [ /^osx1010/, anyType, gte(11) ], + [ /^osx1011/, anyType, lt(11) ], // ------------------------------------------------------- ] From 2aefbd19b096a7958f20d6b804380940ab6512b1 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Mon, 23 Jul 2018 11:20:34 -0400 Subject: [PATCH 4/4] squash: tweak to allow broader testing --- jenkins/scripts/VersionSelectorScript.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 938d016ad..5207aa026 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -63,7 +63,7 @@ def buildExclusions = [ // OSX --------------------------------------------------- [ /^osx1010/, anyType, gte(11) ], - [ /^osx1011/, anyType, lt(11) ], + [ /^osx1011/, releaseType, lt(11) ], // ------------------------------------------------------- ]