From 9af8ddec0ee8fc2d5362eacc4666554559efc215 Mon Sep 17 00:00:00 2001 From: Ulises Gascon Date: Thu, 19 Oct 2023 18:08:47 +0200 Subject: [PATCH 1/4] jenkins: remove macOS 10.x release machines related: https://github.com/nodejs/build/issues/3385#issuecomment-1729281269 --- jenkins/scripts/VersionSelectorScript.groovy | 2 -- 1 file changed, 2 deletions(-) diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 1004c7e31..c49f85b14 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -75,8 +75,6 @@ def buildExclusions = [ // OSX --------------------------------------------------- [ /osx1015/, anyType, gte(21) ], [ /osx11-x64-release-tar/, releaseType, lt(20) ], - [ /osx1015-release-pkg/, releaseType, gte(16) ], - [ /osx1015-release-tar/, releaseType, gte(20) ], // Source / headers / docs ------------------------------- [ /^centos7-release-sources$/, releaseType, gte(18) ], From 146d9cfb070699312fd58c456367f8dda1dad21b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulises=20Gasc=C3=B3n?= Date: Wed, 25 Oct 2023 10:14:46 +0200 Subject: [PATCH 2/4] jenkins: improved version selector for macOS notarization --- 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 c49f85b14..6c3c333d5 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -73,8 +73,8 @@ def buildExclusions = [ [ /sharedlibs_fips20/, anyType, gte(16) ], // OSX --------------------------------------------------- - [ /osx1015/, anyType, gte(21) ], - [ /osx11-x64-release-tar/, releaseType, lt(20) ], + [ /osx11-x64-release-tar/, releaseType, gte(18) ], + [ /osx11-x64-release-pkg/, releaseType, gte(18) ], // Source / headers / docs ------------------------------- [ /^centos7-release-sources$/, releaseType, gte(18) ], From ee124777935dcdf229a6972f4e1afd8dd009b381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulises=20Gasc=C3=B3n?= Date: Wed, 25 Oct 2023 17:04:26 +0200 Subject: [PATCH 3/4] jenkins: removed macOS restrictions --- jenkins/scripts/VersionSelectorScript.groovy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 6c3c333d5..4c2ad29b3 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -72,10 +72,6 @@ def buildExclusions = [ [ /sharedlibs_openssl102/, anyType, gte(16) ], [ /sharedlibs_fips20/, anyType, gte(16) ], - // OSX --------------------------------------------------- - [ /osx11-x64-release-tar/, releaseType, gte(18) ], - [ /osx11-x64-release-pkg/, releaseType, gte(18) ], - // Source / headers / docs ------------------------------- [ /^centos7-release-sources$/, releaseType, gte(18) ], [ /^rhel8-release-sources$/, releaseType, lt(18) ], From c277017337f253fb964ee717715f63f518e5ba52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulises=20Gasc=C3=B3n?= Date: Wed, 25 Oct 2023 20:01:50 +0200 Subject: [PATCH 4/4] jenkins: add restriction for MacOS 10 in Node21 --- jenkins/scripts/VersionSelectorScript.groovy | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index 4c2ad29b3..3b3c4f398 100644 --- a/jenkins/scripts/VersionSelectorScript.groovy +++ b/jenkins/scripts/VersionSelectorScript.groovy @@ -72,6 +72,9 @@ def buildExclusions = [ [ /sharedlibs_openssl102/, anyType, gte(16) ], [ /sharedlibs_fips20/, anyType, gte(16) ], + // OSX --------------------------------------------------- + [ /osx1015/, anyType, gte(21) ], + // Source / headers / docs ------------------------------- [ /^centos7-release-sources$/, releaseType, gte(18) ], [ /^rhel8-release-sources$/, releaseType, lt(18) ],