-
-
Notifications
You must be signed in to change notification settings - Fork 460
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into feature/safe_mode
- Loading branch information
Showing
61 changed files
with
1,042 additions
and
180 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,47 +37,41 @@ jobs: | |
| plugins: false | ||
| skip-artifact: false | ||
| skip-crashpad: false | ||
| clang-tidy-review: false | ||
| # Ubuntu 22.04, Qt 5.15 | ||
| - os: ubuntu-22.04 | ||
| qt-version: 5.15.2 | ||
| force-lto: false | ||
| plugins: false | ||
| skip-artifact: false | ||
| skip-crashpad: false | ||
| clang-tidy-review: true | ||
| # Ubuntu 22.04, Qt 6.2.4 - tests LTO & plugins | ||
| - os: ubuntu-22.04 | ||
| qt-version: 6.2.4 | ||
| force-lto: true | ||
| plugins: true | ||
| skip-artifact: false | ||
| skip-crashpad: false | ||
| clang-tidy-review: false | ||
| # macOS | ||
| - os: macos-latest | ||
| qt-version: 5.15.2 | ||
| force-lto: false | ||
| plugins: false | ||
| skip-artifact: false | ||
| skip-crashpad: false | ||
| clang-tidy-review: false | ||
| # Windows | ||
| - os: windows-latest | ||
| qt-version: 6.5.0 | ||
| force-lto: false | ||
| plugins: false | ||
| skip-artifact: false | ||
| skip-crashpad: false | ||
| clang-tidy-review: false | ||
| # Windows 7/8 | ||
| - os: windows-latest | ||
| qt-version: 5.15.2 | ||
| force-lto: false | ||
| plugins: false | ||
| skip-artifact: false | ||
| skip-crashpad: true | ||
| clang-tidy-review: false | ||
|
|
||
| fail-fast: false | ||
|
|
||
|
|
@@ -329,38 +323,6 @@ jobs: | |
| make -j"$(nproc)" | ||
| shell: bash | ||
|
|
||
| - name: clang-tidy review | ||
| if: matrix.clang-tidy-review && github.event_name == 'pull_request' | ||
| timeout-minutes: 10 | ||
| uses: ZedThree/[email protected] | ||
| with: | ||
| build_dir: build-clang-tidy | ||
| config_file: ".clang-tidy" | ||
| split_workflow: true | ||
| exclude: "lib/*" | ||
| 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 | ||
| 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 | ||
| - name: clang-tidy-review upload | ||
| if: matrix.clang-tidy-review && github.event_name == 'pull_request' | ||
| uses: ZedThree/clang-tidy-review/[email protected] | ||
|
|
||
| - name: Package - AppImage (Ubuntu) | ||
| if: startsWith(matrix.os, 'ubuntu-20.04') && !matrix.skip-artifact | ||
| run: | | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,148 @@ | ||
| --- | ||
| name: clang-tidy | ||
|
|
||
| on: | ||
| pull_request: | ||
|
|
||
| concurrency: | ||
| group: clang-tidy-${{ github.ref }} | ||
| cancel-in-progress: true | ||
|
|
||
| env: | ||
| CHATTERINO_REQUIRE_CLEAN_GIT: On | ||
| C2_BUILD_WITH_QT6: Off | ||
|
|
||
| jobs: | ||
| build: | ||
| name: "clang-tidy ${{ matrix.os }}, Qt ${{ matrix.qt-version }})" | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| # Ubuntu 22.04, Qt 5.15 | ||
| - os: ubuntu-22.04 | ||
| qt-version: 5.15.2 | ||
| plugins: false | ||
|
|
||
| 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/[email protected] | ||
| 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/[email protected] | ||
| 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/[email protected] | ||
| with: | ||
| cache: true | ||
| 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 | ||
|
|
||
| - name: clang-tidy review | ||
| timeout-minutes: 20 | ||
| uses: ZedThree/[email protected] | ||
| with: | ||
| build_dir: build-clang-tidy | ||
| config_file: ".clang-tidy" | ||
| split_workflow: true | ||
| exclude: "lib/*" | ||
| 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 | ||
| 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 | ||
| - name: clang-tidy-review upload | ||
| uses: ZedThree/clang-tidy-review/[email protected] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,13 +3,15 @@ name: Post clang-tidy review comments | |
|
|
||
| on: | ||
| workflow_run: | ||
| workflows: ["Build"] | ||
| workflows: ["clang-tidy"] | ||
| types: | ||
| - completed | ||
|
|
||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| # Only when a build succeeds | ||
| if: ${{ github.event.workflow_run.conclusion == 'success' }} | ||
|
|
||
| steps: | ||
| - uses: ZedThree/clang-tidy-review/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule magic_enum
updated
54 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.