noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use clang-12 for ubuntu 20.04

Browse source
This commit is contained in:
Rasmus Karlsson 2024-01-13 14:10:00 +01:00
parent 2ebe906adf
commit 245d076f49
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.docker/Dockerfile-ubuntu-20.04-base
View file

@ -5,6 +5,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN apt-get update && apt-get -y install --no-install-recommends \ RUN apt-get update && apt-get -y install --no-install-recommends \
cmake \ cmake \
clang-12 \
virtualenv \ virtualenv \
rapidjson-dev \ rapidjson-dev \
libfuse2 \ libfuse2 \

4
.docker/Dockerfile-ubuntu-20.04-build
View file

@ -7,6 +7,10 @@ RUN mkdir /src/build
# cmake # cmake
RUN cd /src/build && \ RUN cd /src/build && \
CXXFLAGS=-fno-sized-deallocation cmake \ CXXFLAGS=-fno-sized-deallocation cmake \
-DUSE_PRECOMPILED_HEADERS=Off \
-DUSE_SUBMODULE_BOOST=Off \
-DCMAKE_C_COMPILER=clang-12 \
-DCMAKE_CXX_COMPILER=clang++-12 \
-DCMAKE_INSTALL_PREFIX=appdir/usr/ \ -DCMAKE_INSTALL_PREFIX=appdir/usr/ \
-DCMAKE_PREFIX_PATH=/opt/qt512/lib/cmake \ -DCMAKE_PREFIX_PATH=/opt/qt512/lib/cmake \
-DBUILD_WITH_QTKEYCHAIN=OFF \ -DBUILD_WITH_QTKEYCHAIN=OFF \

10
.github/workflows/build.yml vendored
View file

@ -304,12 +304,13 @@ jobs:
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get -y install \ sudo apt-get -y install \
gcc-10 \ clang-12
g++-10
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 60
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 60
# Prioritize GCC/G++ 10 over default-installed GCC/G++ 9 # Prioritize GCC/G++ 10 over default-installed GCC/G++ 9
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 60 sudo update-alternatives --install /usr/bin/cc cc /usr/bin/clang 60
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 60 sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 60
- name: Apply Qt patches (Ubuntu) - name: Apply Qt patches (Ubuntu)
if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.qt-version, '5.') if: startsWith(matrix.os, 'ubuntu') && startsWith(matrix.qt-version, '5.')
@ -327,7 +328,6 @@ jobs:
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \ -DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \
-DUSE_PRECOMPILED_HEADERS=OFF \ -DUSE_PRECOMPILED_HEADERS=OFF \
-DUSE_SUBMODULE_BOOST=ON \
-DCMAKE_EXPORT_COMPILE_COMMANDS=On \ -DCMAKE_EXPORT_COMPILE_COMMANDS=On \
-DCHATTERINO_LTO="$C2_ENABLE_LTO" \ -DCHATTERINO_LTO="$C2_ENABLE_LTO" \
-DCHATTERINO_PLUGINS="$C2_PLUGINS" \ -DCHATTERINO_PLUGINS="$C2_PLUGINS" \