-
Notifications
You must be signed in to change notification settings - Fork 458
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes #2450
- Loading branch information
Showing
8 changed files
with
129 additions
and
65 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 |
|---|---|---|
|
|
@@ -14,7 +14,6 @@ jobs: | |
| include: | ||
| - os: ubuntu-20.04 | ||
| buildname: Linux-GCC | ||
| build_type: Debug | ||
| compiler: g++ | ||
| coverage: true | ||
| compiler_flags: >- | ||
|
|
@@ -27,14 +26,12 @@ jobs: | |
|
|
||
| - os: ubuntu-20.04 | ||
| buildname: Linux-Clang | ||
| build_type: Debug | ||
| compiler: clang++ | ||
| compiler_package: clang | ||
| with_qt6: false | ||
|
|
||
| - os: ubuntu-latest | ||
| buildname: Qt 6 | ||
| build_type: Debug | ||
| compiler: g++ | ||
| compiler_package: g++ | ||
| with_qt6: true | ||
|
|
@@ -46,6 +43,15 @@ jobs: | |
| submodules: false | ||
| fetch-depth: 1 | ||
|
|
||
| - name: Enable ccache | ||
| uses: hendrikmuhs/[email protected] | ||
| with: | ||
| key: ${{ github.job }}-${{ matrix.os }} | ||
|
|
||
| - name: Set up ccache | ||
| run: | | ||
| export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" | ||
| - name: Install dependencies | ||
| uses: nick-invision/retry@v2 | ||
| env: | ||
|
|
@@ -59,25 +65,17 @@ jobs: | |
| '${{matrix.compiler_package}}' | ||
| - name: Build with CMake | ||
| uses: lukka/run-cmake@v3 | ||
| uses: lukka/run-cmake@v10 | ||
| with: | ||
| cmakeListsOrSettingsJson: CMakeListsTxtAdvanced | ||
| cmakeListsTxtPath: '${{github.workspace}}/CMakeLists.txt' | ||
| cmakeBuildType: Release | ||
| cmakeGenerator: Ninja | ||
| buildDirectory: '${{runner.workspace}}/build' | ||
| cmakeAppendedArgs: >- | ||
| -DWITH_TESTS=TRUE | ||
| -DPEDANTIC=TRUE | ||
| -DCMAKE_BUILD_TYPE='${{matrix.build_type}}' | ||
| -DCMAKE_INSTALL_PREFIX='${{runner.workspace}}/install' | ||
| -DCMAKE_CXX_FLAGS='${{matrix.compiler_flags}}' | ||
| -DCMAKE_C_FLAGS='${{matrix.compiler_flags}}' | ||
| -DCMAKE_CXX_COMPILER='${{matrix.compiler}}' | ||
| -DWITH_QT6='${{matrix.with_qt6}}' | ||
| - name: Install with CMake | ||
| run: cmake --install '${{runner.workspace}}/build' | ||
| configurePreset: Debug | ||
| buildPreset: Debug | ||
| configurePresetAdditionalArgs: >- | ||
| [ | ||
| '-DCMAKE_CXX_COMPILER=${{matrix.compiler}}', | ||
| '-DCMAKE_CXX_FLAGS=${{matrix.compiler_flags}}', | ||
| '-DCMAKE_C_FLAGS=${{matrix.compiler_flags}}', | ||
| '-DWITH_QT6=${{matrix.with_qt6}}' | ||
| ] | ||
| - name: Create gnupg directory for tests | ||
| run: mkdir -p ~/.gnupg | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -14,8 +14,6 @@ jobs: | |
| include: | ||
| - os: macos-11 | ||
| buildname: macOS 10.15 | ||
| build_type: Release | ||
| compiler: clang_64 | ||
| create_bundle: true | ||
|
|
||
| steps: | ||
|
|
@@ -25,23 +23,27 @@ jobs: | |
| submodules: false | ||
| fetch-depth: 1 | ||
|
|
||
| - name: Enable ccache | ||
| uses: hendrikmuhs/[email protected] | ||
| with: | ||
| key: ${{ github.job }}-${{ matrix.os }} | ||
|
|
||
| - name: Set up ccache | ||
| run: | | ||
| export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" | ||
| - name: Install dependencies | ||
| env: | ||
| HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1 | ||
| HOMEBREW_NO_AUTO_UPDATE: 1 | ||
| HOMEBREW_NO_INSTALL_CLEANUP: 1 | ||
| run: '${{github.workspace}}/utils/github/install-macos.sh' | ||
|
|
||
| - name: Build with CMake | ||
| uses: lukka/run-cmake@v3 | ||
| uses: lukka/run-cmake@v10 | ||
| with: | ||
| cmakeListsOrSettingsJson: CMakeListsTxtAdvanced | ||
| cmakeListsTxtPath: '${{github.workspace}}/CMakeLists.txt' | ||
| cmakeBuildType: Release | ||
| cmakeGenerator: Ninja | ||
| buildDirectory: '${{runner.workspace}}/build' | ||
| cmakeAppendedArgs: >- | ||
| -DWITH_TESTS=TRUE | ||
| -DCMAKE_BUILD_TYPE='${{matrix.build_type}}' | ||
| -DCMAKE_PREFIX_PATH="/usr/local/opt/qt@5/lib/cmake" | ||
| -DCMAKE_OSX_DEPLOYMENT_TARGET='10.15' | ||
| -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" | ||
| configurePreset: macOS | ||
| buildPreset: macOS | ||
|
|
||
| - name: Create gnupg directory for tests | ||
| run: mkdir -p ~/.gnupg | ||
|
|
||
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,45 @@ | ||
| { | ||
| "version": 3, | ||
| "configurePresets": [ | ||
| { | ||
| "name": "Debug", | ||
| "generator": "Ninja", | ||
| "binaryDir": "${sourceParentDir}/build", | ||
| "installDir": "${sourceParentDir}/install", | ||
| "cacheVariables": { | ||
| "WITH_TESTS": "TRUE", | ||
| "PEDANTIC": "TRUE", | ||
| "CMAKE_C_COMPILER_LAUNCHER": "ccache", | ||
| "CMAKE_CXX_COMPILER_LAUNCHER": "ccache" | ||
| } | ||
| }, | ||
| { | ||
| "name": "macOS", | ||
| "generator": "Ninja", | ||
| "binaryDir": "${sourceParentDir}/build", | ||
| "installDir": "${sourceParentDir}/build", | ||
| "cacheVariables": { | ||
| "WITH_TESTS": "TRUE", | ||
| "CMAKE_PREFIX_PATH": "/usr/local/opt/qt@5/lib/cmake", | ||
| "CMAKE_OSX_DEPLOYMENT_TARGET": "10.15", | ||
| "CMAKE_C_COMPILER_LAUNCHER": "ccache", | ||
| "CMAKE_CXX_COMPILER_LAUNCHER": "ccache", | ||
| "CMAKE_CXX_FLAGS": "-Wno-deprecated-declarations" | ||
| } | ||
| } | ||
| ], | ||
| "buildPresets": [ | ||
| { | ||
| "name": "Debug", | ||
| "configurePreset": "Debug", | ||
| "configuration": "Debug", | ||
| "targets": "install" | ||
| }, | ||
| { | ||
| "name": "macOS", | ||
| "configurePreset": "macOS", | ||
| "configuration": "Release", | ||
| "targets": "install" | ||
| } | ||
| ] | ||
| } |
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
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 |
|---|---|---|
|
|
@@ -49,6 +49,8 @@ else | |
| fi | ||
|
|
||
| packages=( | ||
| ninja-build | ||
|
|
||
| # fixes some issues on X11 | ||
| libxfixes-dev | ||
| libxtst-dev | ||
|
|
||
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