From b7092825cb2b88549bda182f56bb15255f5e2080 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Fri, 9 Apr 2021 00:15:01 +1000 Subject: [PATCH] armv7: enable gcc-8 for armv7 cross-compile Ref: https://github.com/nodejs/build/issues/2445 --- ansible/roles/jenkins-worker/vars/main.yml | 2 -- jenkins/scripts/VersionSelectorScript.groovy | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml index 4d5ed8413..9fb0ebf55 100644 --- a/ansible/roles/jenkins-worker/vars/main.yml +++ b/ansible/roles/jenkins-worker/vars/main.yml @@ -121,11 +121,9 @@ raspberry_pi: { { name: 'jessie', template: 'rpi_jessie.Dockerfile.j2' } ], armv7l: [ - { name: 'jessie', template: 'rpi_jessie.Dockerfile.j2' }, { name: 'stretch', template: 'rpi_stretch.Dockerfile.j2' } ], arm64: [ - { name: 'jessie', template: 'rpi_jessie.Dockerfile.j2' }, { name: 'stretch', template: 'rpi_stretch.Dockerfile.j2' } ] } diff --git a/jenkins/scripts/VersionSelectorScript.groovy b/jenkins/scripts/VersionSelectorScript.groovy index c72201bfc..2b90b58b4 100644 --- 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 -----------------------------------------------