fixup! fixup! ansible,jenkins: install gcc-7 on ubuntu1604 machines, …

…use on node>12
nodejs · Oct 23, 2019 · e119957 · e119957
1 parent 96a473f
commit e119957
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
@@ -120,7 +120,7 @@ packages: {
   ],
 
   ubuntu: [
-    'ccache,g++,gcc,g++-7,gcc-7,git,libfontconfig1,sudo',
+    'ccache,g++,gcc,g++-6,gcc-6,git,libfontconfig1,sudo',
   ],
 
   ubuntu1404: [

diff --git a/jenkins/scripts/select-compiler.sh b/jenkins/scripts/select-compiler.sh
@@ -127,10 +127,10 @@ elif [ "$SELECT_ARCH" = "X64" ]; then
     echo "Compiler set to devtoolset-6"
   elif test $nodes = "ubuntu1604"; then
     if [ "$NODEJS_MAJOR_VERSION" -gt "12" ]; then
-      export CC="gcc-7"
-      export CXX="g++-7"
-      export LINK="g++-7"
-      echo "Compiler set to GCC 7 for $NODEJS_MAJOR_VERSION"
+      export CC="gcc-6"
+      export CXX="g++-6"
+      export LINK="g++-6"
+      echo "Compiler set to GCC 6 for $NODEJS_MAJOR_VERSION"
     fi
   fi