Skip to content

Commit 3804506

Browse files
committed
Select devtoolset-8 for centos7-64/centos7-arm64
In addition, configuration changes were made in CI. PR-URL: #2262
1 parent b0a9dcf commit 3804506

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

jenkins/scripts/VersionSelectorScript.groovy

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ def buildExclusions = [
2121
// Linux -------------------------------------------------
2222
[ /^centos6/, releaseType, lt(8) ],
2323
[ /^centos6/, anyType, gte(12) ],
24-
[ /centos[67]-(arm)?(64|32)-gcc48/, anyType, gte(10) ],
25-
[ /centos[67]-(arm)?(64|32)-gcc6/, anyType, lt(10) ],
26-
[ /centos6-32-gcc6/, releaseType, gte(10) ], // 32-bit linux for <10 only
24+
[ /^centos[67]-(arm)?(64|32)-gcc48/,anyType, gte(10) ],
25+
[ /^centos[67]-(arm)?(64|32)-gcc6/, anyType, lt(10) ],
26+
[ /^centos[67]-(arm)?(64|32)-gcc6/, anyType, gte(14) ], // 14.x: gcc6 builds stop
27+
[ /^centos7-(arm)?(64)-gcc8/, anyType, lt(14) ], // 14.x: gcc8 builds start
28+
[ /^centos6-32-gcc6/, releaseType, gte(10) ], // 32-bit linux for <10 only
2729
[ /^centos7-64/, releaseType, lt(12) ],
2830
[ /debian8-x86/, anyType, gte(10) ], // 32-bit linux for <10 only
2931
[ /debian8/, anyType, gte(13) ],
@@ -48,6 +50,7 @@ def buildExclusions = [
4850
[ /^cross-compiler-armv[67]-gcc-4.9/, anyType, lt(10) ],
4951
[ /^cross-compiler-armv[67]-gcc-4.9/, anyType, gte(12) ],
5052
[ /^cross-compiler-armv[67]-gcc-6/, anyType, lt(12) ],
53+
[ /^ubuntu1604-arm64/, anyType, gte(14) ],
5154

5255
// Windows -----------------------------------------------
5356
// https://github.com/nodejs/build/blob/master/doc/windows-visualstudio-supported-versions.md

jenkins/scripts/select-compiler.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ elif [ "$SELECT_ARCH" = "X64" ]; then
154154
echo "Setting compiler for Node version $NODEJS_MAJOR_VERSION on x64"
155155

156156
case $nodes in
157+
centos7-64-gcc8 )
158+
. /opt/rh/devtoolset-8/enable
159+
echo "Compiler set to devtoolset-8"
160+
;;
157161
centos6-64-gcc48 )
158162
. /opt/rh/devtoolset-2/enable
159163
echo "Compiler set to devtoolset-2"
@@ -177,6 +181,10 @@ elif [ "$SELECT_ARCH" = "ARM64" ]; then
177181

178182

179183
case $nodes in
184+
centos7-arm64-gcc8 )
185+
. /opt/rh/devtoolset-8/enable
186+
echo "Compiler set to devtoolset-8"
187+
;;
180188
centos[67]-arm64-gcc6 )
181189
. /opt/rh/devtoolset-6/enable
182190
echo "Compiler set to devtoolset-6"

0 commit comments

Comments
 (0)