From 0388289e3aedf554ee795f0b641ca01a903a0304 Mon Sep 17 00:00:00 2001 From: Frantisek Sumsal Date: Fri, 29 Jan 2021 19:00:56 +0100 Subject: [PATCH] ci: use the correct compiler version --- .github/workflows/cibuild.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cibuild.sh b/.github/workflows/cibuild.sh index 8256be9650..80583c5136 100755 --- a/.github/workflows/cibuild.sh +++ b/.github/workflows/cibuild.sh @@ -2,14 +2,14 @@ PHASES=(${@:-CONFIGURE MAKE INSTALL CHECK DISTCHECK}) COMPILER="${COMPILER:?}" -COMPILER_VERSION="${COMPILER_VERSION:?}" +COMPILER_VERSION="${COMPILER_VERSION}" if [[ "$COMPILER" == clang ]]; then - CC="clang" - CXX="clang++" + CC="clang${COMPILER_VERSION:+-$COMPILER_VERSION}" + CXX="clang++${COMPILER_VERSION:+-$COMPILER_VERSION}" elif [[ "$COMPILER" == gcc ]]; then - CC="gcc" - CXX="g++" + CC="gcc${COMPILER_VERSION:+-$COMPILER_VERSION}" + CXX="g++${COMPILER_VERSION:+-$COMPILER_VERSION}" fi set -ex @@ -28,7 +28,7 @@ for phase in "${PHASES[@]}"; do --without-python \ --enable-werror" - if [[ "$COMPILER" == clang ]]; then + if [[ "$COMPILER" == clang* ]]; then opts="$opts --enable-fuzzing-engine" fi -- 2.47.3