Skip to content

Commit a5260b2

Browse files
committed
armv7: enable gcc-8 for armv7 cross-compile
Ref: #2445
1 parent 7079715 commit a5260b2

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ansible/roles/jenkins-worker/vars/main.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ java_path: {
9797
'macos10.14': 'java',
9898
'macos10.15': 'java',
9999
'macos10.16': 'java',
100-
# Currently hardcoded untill adopt have their build available
101-
'macos11.0': '/Users/administrator/zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64/bin/java',
100+
'macos11.0': 'java',
102101
'smartos15': '/opt/local/java/openjdk8/bin/java',
103102
'smartos16': '/opt/local/java/openjdk8/bin/java',
104103
'smartos17': '/opt/local/java/openjdk8/bin/java',

jenkins/scripts/VersionSelectorScript.groovy

+2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ def buildExclusions = [
5050
[ /^cross-compiler-ubuntu1604-armv[67]-gcc-6/, anyType, lt(12) ],
5151
[ /^cross-compiler-ubuntu1604-armv[67]-gcc-6/, anyType, gte(14) ],
5252
[ /^cross-compiler-ubuntu1804-armv7-gcc-6/, anyType, lt(14) ],
53+
[ /^cross-compiler-ubuntu1804-armv7-gcc-6/, anyType, gte(16) ],
54+
[ /^cross-compiler-ubuntu1804-armv7-gcc-8, anyType, lt(16) ],
5355
[ /^ubuntu1604-arm64/, anyType, gte(14) ],
5456

5557
// Windows -----------------------------------------------

0 commit comments

Comments
 (0)