fix missing header on ubuntu 22.04, apply clang-format, working on CI

This commit is contained in:
Jeremy Borgman
2025-06-03 20:05:11 -05:00
parent 50d9309e52
commit 533c811016
3 changed files with 49 additions and 53 deletions

View File

@@ -26,7 +26,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04]
os: [ubuntu-24.04]
steps:
- name: Checkout Source code
@@ -46,15 +46,9 @@ jobs:
cmake \
extra-cmake-modules \
build-essential \
qtbase5-dev \
qttools5-dev-tools \
qttools5-dev \
libqt5dbus5 \
libqt5network5 \
libqt5core5a \
libqt5widgets5 \
libqt5gui5 \
libqt5svg5-dev
qt6-base-dev \
qt6-svg-dev \
qttools6-tools-dev \
- name: Create Build Environment
# Some projects don't allow in-source building, so create a separate build directory
@@ -86,45 +80,46 @@ jobs:
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest -C $BUILD_TYPE
windows-build:
runs-on: ${{ matrix.config.os }}
strategy:
fail-fast: false
matrix:
config:
- {
name: "Windows 2019 MSVC",
artifact: "Windows-MSVC.tar.xz",
os: windows-2019,
cc: "cl", cxx: "cl",
environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
}
steps:
- uses: actions/checkout@v4
- name: Cache Qt
id: cache-qt
uses: actions/cache@v3
with:
path: ./build/Qt
key: ${{ runner.os }}-QtCache
- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: 5.15.2
target: desktop
dir: '${{ github.workspace }}/build/'
- name: Configure
working-directory: build
shell: powershell
run: |
cmake -DCMAKE_BUILD_TYPE=$env:BUILD_TYPE ../
- name: Build
working-directory: build
shell: powershell
run: |
cmake --build . --config $env:BUILD_TYPE
# windows-build:
# runs-on: ${{ matrix.config.os }}
# strategy:
# fail-fast: false
# matrix:
# config:
# - {
# name: "Windows 2019 MSVC",
# artifact: "Windows-MSVC.tar.xz",
# os: windows-2019,
# cc: "cl", cxx: "cl",
# environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
# }
#
# steps:
# - uses: actions/checkout@v4
#
# - name: Cache Qt
# id: cache-qt
# uses: actions/cache@v3
# with:
# path: ./build/Qt
# key: ${{ runner.os }}-QtCache
#
# - name: Install Qt
# uses: jurplel/install-qt-action@v4
# with:
# version: 5.15.2
# target: desktop
# dir: '${{ github.workspace }}/build/'
#
# - name: Configure
# working-directory: build
# shell: powershell
# run: |
# cmake -DCMAKE_BUILD_TYPE=$env:BUILD_TYPE ../
#
# - name: Build
# working-directory: build
# shell: powershell
# run: |
# cmake --build . --config $env:BUILD_TYPE
#

View File

@@ -17,6 +17,7 @@
#include <QSizePolicy>
#include <QSpinBox>
#include <QStandardPaths>
#include <QStringDecoder>
#include <QVBoxLayout>
GeneralConf::GeneralConf(QWidget* parent)