Skip to content

Commit

Permalink
CI: Clear remnants of the workaround; use clang-17 on Linux
Browse files Browse the repository at this point in the history
Clang-16 fails to compile Quaternion with very weird errors between Qt
and STL :(
  • Loading branch information
KitsuneRal committed Oct 27, 2024
1 parent 0d814d9 commit d1fcf3a
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ jobs:
if: startsWith(matrix.os, 'ubuntu')
run: |
COMMON_PKGS="libolm-dev ninja-build"
#COMMON_PKGS="$COMMON_PKGS clang-15" # Workaround for https://github.com/actions/runner-images/issues/8659
sudo apt-get -qq update
sudo apt-get -qq install $COMMON_PKGS \
libgl1-mesa-dev qt6-declarative-dev qt6-base-private-dev qt6-tools-dev qt6-tools-dev-tools \
Expand All @@ -107,9 +106,8 @@ jobs:
echo "CC=gcc" >>$GITHUB_ENV
echo "CXX=g++" >>$GITHUB_ENV
elif [[ '${{ runner.os }}' == 'Linux' ]]; then
# REMOVECOMMENT: Workaround for https://github.com/actions/runner-images/issues/8659
echo "CC=clang-16" >>$GITHUB_ENV
echo "CXX=clang++-16" >>$GITHUB_ENV
echo "CC=clang-17" >>$GITHUB_ENV
echo "CXX=clang++-17" >>$GITHUB_ENV
fi
echo "CMAKE_ARGS=-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo \
${{ runner.os != 'Linux' && '-DCMAKE_MAKE_PROGRAM=$IQTA_TOOLS/Ninja/ninja' || '' }} \
Expand Down

0 comments on commit d1fcf3a

Please sign in to comment.