From f169c13d8e4cac4a79163236b5efb724ee25fa63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= Date: Wed, 2 Jul 2025 17:07:44 +0000 Subject: [PATCH] Replace PPC g++-10 with g++14. --- ci/build.linux.gitlab-ci.yml | 11 ++++++----- ci/test.linux.gitlab-ci.yml | 17 +++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ci/build.linux.gitlab-ci.yml b/ci/build.linux.gitlab-ci.yml index a8dd49ee1..82b750021 100644 --- a/ci/build.linux.gitlab-ci.yml +++ b/ci/build.linux.gitlab-ci.yml @@ -294,6 +294,7 @@ build:linux:cross:aarch64:clang-12:default: .build:linux:cross:ppc64le: extends: .build:linux:cross + image: ubuntu:24.04 variables: EIGEN_CI_TARGET_ARCH: ppc64le EIGEN_CI_CROSS_TARGET_TRIPLE: powerpc64le-linux-gnu @@ -301,19 +302,19 @@ build:linux:cross:aarch64:clang-12:default: -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_CROSSCOMPILING_EMULATOR=qemu-ppc64le-static;-L;/usr/powerpc64le-linux-gnu -build:linux:cross:ppc64le:gcc-10:default: +build:linux:cross:ppc64le:gcc-14:default: extends: .build:linux:cross:ppc64le variables: - EIGEN_CI_CROSS_INSTALL: g++-10-powerpc64le-linux-gnu qemu-user-static - EIGEN_CI_CROSS_C_COMPILER: powerpc64le-linux-gnu-gcc-10 - EIGEN_CI_CROSS_CXX_COMPILER: powerpc64le-linux-gnu-g++-10 + EIGEN_CI_CROSS_INSTALL: g++-14-powerpc64le-linux-gnu qemu-user-static + EIGEN_CI_CROSS_C_COMPILER: powerpc64le-linux-gnu-gcc-14 + EIGEN_CI_CROSS_CXX_COMPILER: powerpc64le-linux-gnu-g++-14 build:linux:cross:ppc64le:clang-12:default: extends: .build:linux:cross:ppc64le variables: EIGEN_CI_C_COMPILER: clang-12 EIGEN_CI_CXX_COMPILER: clang++-12 - EIGEN_CI_CROSS_INSTALL: g++-10-powerpc64le-linux-gnu clang-12 qemu-user-static + EIGEN_CI_CROSS_INSTALL: g++-14-powerpc64le-linux-gnu clang-12 qemu-user-static ######## loongarch64 ################################################# diff --git a/ci/test.linux.gitlab-ci.yml b/ci/test.linux.gitlab-ci.yml index 126800d64..69018f07c 100644 --- a/ci/test.linux.gitlab-ci.yml +++ b/ci/test.linux.gitlab-ci.yml @@ -369,24 +369,25 @@ test:linux:aarch64:clang-12:default:unsupported: .test:linux:ppc64le: extends: .test:linux + image: ubuntu:24.04 variables: EIGEN_CI_TARGET_ARCH: ppc64le EIGEN_CI_CROSS_TARGET_TRIPLE: powerpc64le-linux-gnu -.test:linux:ppc64le:gcc-10:default: +.test:linux:ppc64le:gcc-14:default: extends: .test:linux:ppc64le - needs: [ build:linux:cross:ppc64le:gcc-10:default ] + needs: [ build:linux:cross:ppc64le:gcc-14:default ] variables: - EIGEN_CI_CROSS_INSTALL: g++-10-powerpc64le-linux-gnu qemu-user-static + EIGEN_CI_CROSS_INSTALL: g++-14-powerpc64le-linux-gnu qemu-user-static EIGEN_CI_CTEST_ARGS: --timeout 2000 -test:linux:ppc64le:gcc-10:default:official: - extends: .test:linux:ppc64le:gcc-10:default +test:linux:ppc64le:gcc-14:default:official: + extends: .test:linux:ppc64le:gcc-14:default variables: EIGEN_CI_CTEST_LABEL: Official -test:linux:ppc64le:gcc-10:default:unsupported: - extends: .test:linux:ppc64le:gcc-10:default +test:linux:ppc64le:gcc-14:default:unsupported: + extends: .test:linux:ppc64le:gcc-14:default variables: EIGEN_CI_CTEST_LABEL: Unsupported @@ -394,7 +395,7 @@ test:linux:ppc64le:gcc-10:default:unsupported: extends: .test:linux:ppc64le needs: [ build:linux:cross:ppc64le:clang-12:default ] variables: - EIGEN_CI_CROSS_INSTALL: g++-10-powerpc64le-linux-gnu clang-12 qemu-user-static + EIGEN_CI_CROSS_INSTALL: g++-14-powerpc64le-linux-gnu clang-12 qemu-user-static test:linux:ppc64le:clang-12:default:official: extends: .test:linux:ppc64le:clang-12:default