armv7: enable gcc-8 for armv7 cross-compile

Ref: #2445
nodejs · Apr 8, 2021 · 96c2fcb · 96c2fcb
1 parent cdf110b
commit 96c2fcb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
@@ -97,8 +97,7 @@ java_path: {
   'macos10.14': 'java',
   'macos10.15': 'java',
   'macos10.16': 'java',
-  # Currently hardcoded untill adopt have their build available
-  'macos11.0': '/Users/administrator/zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64/bin/java',
+  'macos11.0': 'java',
   'smartos15': '/opt/local/java/openjdk8/bin/java',
   'smartos16': '/opt/local/java/openjdk8/bin/java',
   'smartos17': '/opt/local/java/openjdk8/bin/java',

diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy
@@ -50,6 +50,8 @@ def buildExclusions = [
   [ /^cross-compiler-ubuntu1604-armv[67]-gcc-6/,   anyType, lt(12)  ],
   [ /^cross-compiler-ubuntu1604-armv[67]-gcc-6/,   anyType, gte(14) ],
   [ /^cross-compiler-ubuntu1804-armv7-gcc-6/,      anyType, lt(14)  ],
+  [ /^cross-compiler-ubuntu1804-armv7-gcc-6/,      anyType, gte(16) ],
+  [ /^cross-compiler-ubuntu1804-armv7-gcc-8,       anyType, lt(16)  ],
   [ /^ubuntu1604-arm64/,              anyType,     gte(14) ],
 
   // Windows -----------------------------------------------