mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
ci: run clang-tidy with Qt 6 and update action (#5273)
This commit is contained in:
nerix
GitHub
parent
9583a10b88
commit
84e641d589
4 changed files with 53 additions and 100 deletions
34
.CI/setup-clang-tidy.sh
Executable file
34
.CI/setup-clang-tidy.sh
Executable file
|
|
@ -0,0 +1,34 @@
|
|||
#!/bin/bash
|
||||
|
||||
set -ev;
|
||||
|
||||
# aqt installs into .qtinstall/Qt/<version>/gcc_64
|
||||
# This is doing the same as jurplel/install-qt-action
|
||||
# See https://github.com/jurplel/install-qt-action/blob/74ca8cd6681420fc8894aed264644c7a76d7c8cb/action/src/main.ts#L52-L74
|
||||
qtpath=$(echo .qtinstall/Qt/[0-9]*/*/bin/qmake | sed -e s:/bin/qmake$::)
|
||||
export LD_LIBRARY_PATH="$qtpath/lib"
|
||||
export QT_ROOT_DIR=$qtpath
|
||||
export QT_PLUGIN_PATH="$qtpath/plugins"
|
||||
export PATH="$PATH:$(realpath "$qtpath/bin")"
|
||||
export Qt6_DIR="$(realpath "$qtpath")"
|
||||
|
||||
cmake -S. -Bbuild-clang-tidy \
|
||||
-DCMAKE_BUILD_TYPE=Debug \
|
||||
-DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \
|
||||
-DUSE_PRECOMPILED_HEADERS=OFF \
|
||||
-DCMAKE_EXPORT_COMPILE_COMMANDS=On \
|
||||
-DCHATTERINO_LTO=Off \
|
||||
-DCHATTERINO_PLUGINS=On \
|
||||
-DBUILD_WITH_QT6=On \
|
||||
-DBUILD_TESTS=On \
|
||||
-DBUILD_BENCHMARKS=On
|
||||
|
||||
# Run MOC and UIC
|
||||
# This will compile the dependencies
|
||||
# Get the targets using `ninja -t targets | grep autogen`
|
||||
cmake --build build-clang-tidy --parallel -t \
|
||||
Core_autogen \
|
||||
LibCommuni_autogen \
|
||||
Model_autogen \
|
||||
Util_autogen \
|
||||
chatterino-lib_autogen
|
||||
113
.github/workflows/clang-tidy.yml
vendored
113
.github/workflows/clang-tidy.yml
vendored
|
|
@ -8,60 +8,25 @@ concurrency:
|
|||
group: clang-tidy-${{ github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
env:
|
||||
CHATTERINO_REQUIRE_CLEAN_GIT: On
|
||||
C2_BUILD_WITH_QT6: Off
|
||||
|
||||
jobs:
|
||||
build:
|
||||
review:
|
||||
name: "clang-tidy ${{ matrix.os }}, Qt ${{ matrix.qt-version }})"
|
||||
runs-on: ${{ matrix.os }}
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
# Ubuntu 22.04, Qt 5.15
|
||||
# Ubuntu 22.04, Qt 6.6
|
||||
- os: ubuntu-22.04
|
||||
qt-version: 5.15.2
|
||||
plugins: false
|
||||
qt-version: 6.6.2
|
||||
|
||||
fail-fast: false
|
||||
|
||||
steps:
|
||||
- name: Enable plugin support
|
||||
if: matrix.plugins
|
||||
run: |
|
||||
echo "C2_PLUGINS=ON" >> "$GITHUB_ENV"
|
||||
shell: bash
|
||||
|
||||
- name: Set BUILD_WITH_QT6
|
||||
if: startsWith(matrix.qt-version, '6.')
|
||||
run: |
|
||||
echo "C2_BUILD_WITH_QT6=ON" >> "$GITHUB_ENV"
|
||||
shell: bash
|
||||
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
fetch-depth: 0 # allows for tags access
|
||||
|
||||
- name: Install Qt5
|
||||
if: startsWith(matrix.qt-version, '5.')
|
||||
uses: jurplel/install-qt-action@v3.3.0
|
||||
with:
|
||||
cache: true
|
||||
cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
|
||||
version: ${{ matrix.qt-version }}
|
||||
|
||||
- name: Install Qt 6.5.3 imageformats
|
||||
if: startsWith(matrix.qt-version, '6.')
|
||||
uses: jurplel/install-qt-action@v3.3.0
|
||||
with:
|
||||
cache: false
|
||||
modules: qtimageformats
|
||||
set-env: false
|
||||
version: 6.5.3
|
||||
extra: --noarchives
|
||||
|
||||
- name: Install Qt6
|
||||
if: startsWith(matrix.qt-version, '6.')
|
||||
uses: jurplel/install-qt-action@v3.3.0
|
||||
|
|
@ -70,79 +35,31 @@ jobs:
|
|||
cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
|
||||
modules: qt5compat qtimageformats
|
||||
version: ${{ matrix.qt-version }}
|
||||
|
||||
# LINUX
|
||||
- name: Install dependencies
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get -y install \
|
||||
cmake \
|
||||
virtualenv \
|
||||
rapidjson-dev \
|
||||
libfuse2 \
|
||||
libssl-dev \
|
||||
libboost-dev \
|
||||
libxcb-randr0-dev \
|
||||
libboost-system-dev \
|
||||
libboost-filesystem-dev \
|
||||
libpulse-dev \
|
||||
libxkbcommon-x11-0 \
|
||||
build-essential \
|
||||
libgl1-mesa-dev \
|
||||
libxcb-icccm4 \
|
||||
libxcb-image0 \
|
||||
libxcb-keysyms1 \
|
||||
libxcb-render-util0 \
|
||||
libxcb-xinerama0
|
||||
|
||||
- name: Apply Qt5 patches
|
||||
if: startsWith(matrix.qt-version, '5.')
|
||||
run: |
|
||||
patch "$Qt5_DIR/include/QtConcurrent/qtconcurrentthreadengine.h" .patches/qt5-on-newer-gcc.patch
|
||||
shell: bash
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
mkdir build
|
||||
cd build
|
||||
CXXFLAGS=-fno-sized-deallocation cmake \
|
||||
-DCMAKE_INSTALL_PREFIX=appdir/usr/ \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On \
|
||||
-DUSE_PRECOMPILED_HEADERS=OFF \
|
||||
-DCMAKE_EXPORT_COMPILE_COMMANDS=On \
|
||||
-DCHATTERINO_LTO="$C2_ENABLE_LTO" \
|
||||
-DCHATTERINO_PLUGINS="$C2_PLUGINS" \
|
||||
-DBUILD_WITH_QT6="$C2_BUILD_WITH_QT6" \
|
||||
..
|
||||
shell: bash
|
||||
dir: ${{ github.workspace }}/.qtinstall
|
||||
set-env: false
|
||||
|
||||
- name: clang-tidy review
|
||||
timeout-minutes: 20
|
||||
uses: ZedThree/clang-tidy-review@v0.17.3
|
||||
uses: ZedThree/clang-tidy-review@v0.18.0
|
||||
with:
|
||||
build_dir: build-clang-tidy
|
||||
config_file: ".clang-tidy"
|
||||
split_workflow: true
|
||||
exclude: "lib/*,tools/crash-handler/*"
|
||||
cmake_command: >-
|
||||
cmake -S. -Bbuild-clang-tidy
|
||||
-DCMAKE_BUILD_TYPE=Release
|
||||
-DPAJLADA_SETTINGS_USE_BOOST_FILESYSTEM=On
|
||||
-DUSE_PRECOMPILED_HEADERS=OFF
|
||||
-DCMAKE_EXPORT_COMPILE_COMMANDS=On
|
||||
-DCHATTERINO_LTO=Off
|
||||
-DCHATTERINO_PLUGINS=On
|
||||
-DBUILD_WITH_QT6=Off
|
||||
-DBUILD_TESTS=On
|
||||
-DBUILD_BENCHMARKS=On
|
||||
./.CI/setup-clang-tidy.sh
|
||||
apt_packages: >-
|
||||
qttools5-dev, qt5-image-formats-plugins, libqt5svg5-dev,
|
||||
libsecret-1-dev,
|
||||
libboost-dev, libboost-system-dev, libboost-filesystem-dev,
|
||||
libssl-dev,
|
||||
rapidjson-dev,
|
||||
libbenchmark-dev
|
||||
libbenchmark-dev,
|
||||
build-essential,
|
||||
libgl1-mesa-dev, libgstreamer-gl1.0-0, libpulse-dev,
|
||||
libxcb-glx0, libxcb-icccm4, libxcb-image0, libxcb-keysyms1, libxcb-randr0,
|
||||
libxcb-render-util0, libxcb-render0, libxcb-shape0, libxcb-shm0, libxcb-sync1,
|
||||
libxcb-util1, libxcb-xfixes0, libxcb-xinerama0, libxcb1, libxkbcommon-dev,
|
||||
libxkbcommon-x11-0, libxcb-xkb-dev, libxcb-cursor0
|
||||
|
||||
- name: clang-tidy-review upload
|
||||
uses: ZedThree/clang-tidy-review/upload@v0.17.3
|
||||
uses: ZedThree/clang-tidy-review/upload@v0.18.0
|
||||
|
|
|
|||
5
.github/workflows/post-clang-tidy-review.yml
vendored
5
.github/workflows/post-clang-tidy-review.yml
vendored
|
|
@ -8,12 +8,13 @@ on:
|
|||
- completed
|
||||
|
||||
jobs:
|
||||
build:
|
||||
post:
|
||||
runs-on: ubuntu-latest
|
||||
# Only when a build succeeds
|
||||
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
||||
|
||||
steps:
|
||||
- uses: ZedThree/clang-tidy-review/post@v0.17.3
|
||||
- uses: ZedThree/clang-tidy-review/post@v0.18.0
|
||||
with:
|
||||
lgtm_comment_body: ""
|
||||
num_comments_as_exitcode: false
|
||||
|
|
|
|||
|
|
@ -194,6 +194,7 @@
|
|||
- Dev: Cleaned up unused code in `MessageElement` and `MessageLayoutElement`. (#5225)
|
||||
- Dev: Adapted `magic_enum` to Qt's Utf-16 strings. (#5258)
|
||||
- Dev: `NetworkManager`'s statics are now created in its `init` method. (#5254)
|
||||
- Dev: `clang-tidy` CI now uses Qt 6. (#5273)
|
||||
|
||||
## 2.4.6
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue