From 03631de497a625604b21904ae2a2db145443ea7b Mon Sep 17 00:00:00 2001 From: Sam Roberts Date: Mon, 1 Apr 2019 12:01:51 -0700 Subject: [PATCH] ansible: update minimum gcc on linux-ppc64le to gcc-6 (#1723) PR-URL: https://github.com/nodejs/build/pull/1723 Reviewed-By: Refael Ackermann Reviewed-By: Michael Dawson --- ansible/roles/baselayout/tasks/partials/repo/ubuntu1404.yml | 4 ++-- ansible/roles/baselayout/vars/main.yml | 2 +- ansible/roles/jenkins-worker/meta/main.yml | 1 - ansible/roles/jenkins-worker/tasks/main.yml | 3 +++ jenkins/scripts/select-compiler.sh | 6 +++++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ansible/roles/baselayout/tasks/partials/repo/ubuntu1404.yml b/ansible/roles/baselayout/tasks/partials/repo/ubuntu1404.yml index 0ee082355..2b341269d 100644 --- a/ansible/roles/baselayout/tasks/partials/repo/ubuntu1404.yml +++ b/ansible/roles/baselayout/tasks/partials/repo/ubuntu1404.yml @@ -1,7 +1,7 @@ --- # -# add PPA for gcc 4.9 +# add PPA for gcc updates # - name: "repo : add Ubuntu Toolchain PPA" @@ -9,4 +9,4 @@ repo: 'ppa:ubuntu-toolchain-r/test' state: present update_cache: yes - register: has_updated_package_repo \ No newline at end of file + register: has_updated_package_repo diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index d3a014cb5..d8d128044 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -106,6 +106,6 @@ packages: { ], ubuntu1404: [ - 'ntp,g++-4.8,gcc-4.8,g++-4.9,gcc-4.9,binutils-2.26', + 'ntp,gcc-8,g++-8,gcc-6,g++-6,g++-4.8,gcc-4.8,g++-4.9,gcc-4.9,binutils-2.26', ] } diff --git a/ansible/roles/jenkins-worker/meta/main.yml b/ansible/roles/jenkins-worker/meta/main.yml index bcbd42630..7148709d2 100644 --- a/ansible/roles/jenkins-worker/meta/main.yml +++ b/ansible/roles/jenkins-worker/meta/main.yml @@ -5,5 +5,4 @@ # dependencies: -- { 'role': 'java-base' } - { 'role': 'gcc', when: os|startswith("rhel7") } diff --git a/ansible/roles/jenkins-worker/tasks/main.yml b/ansible/roles/jenkins-worker/tasks/main.yml index 29678490f..3592cfcfb 100644 --- a/ansible/roles/jenkins-worker/tasks/main.yml +++ b/ansible/roles/jenkins-worker/tasks/main.yml @@ -273,3 +273,6 @@ when: os in needs_monit include: monit.yml static: false + +- include_role: + name: java-base diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh index c5d606240..67a833167 100644 --- a/jenkins/scripts/select-compiler.sh +++ b/jenkins/scripts/select-compiler.sh @@ -20,7 +20,11 @@ if [ "$SELECT_ARCH" = "PPC64LE" ]; then echo "Setting compiler for Node version $NODEJS_MAJOR_VERSION on ppc64le" - if [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then + if [ "$NODEJS_MAJOR_VERSION" -gt "11" ]; then + # See: https://github.com/nodejs/build/pull/1723#discussion_r265740122 + export PATH=/usr/lib/binutils-2.26/bin/:$PATH + export COMPILER_LEVEL="6" + elif [ "$NODEJS_MAJOR_VERSION" -gt "9" ]; then export PATH=/usr/lib/binutils-2.26/bin/:$PATH export COMPILER_LEVEL="4.9" fi