Skip to content

Commit

Permalink
Moved to Qt6.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Fanda Vacek committed Dec 27, 2023
1 parent e2e7884 commit 5928dbc
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 5 deletions.
14 changes: 11 additions & 3 deletions .github/actions/cmake/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ description: "Invoke CMake and generate build files"
inputs:
qt_version:
description: "Specify Qt version to use"
default: "6.5.2"
required: true
qt_arch:
description: "Specify Qt version to use"
default: "gcc_64"
use_qt6:
description: "Specify whether we're using Qt 5 or Qt 6"
default: "ON"
required: true
modules:
description: "Specify which modules should be installed"
default: "qtserialport qtmultimedia"
required: true
additional_cmake_args:
description: "Additional args to pass to CMake"
default: ""
Expand All @@ -28,6 +28,14 @@ runs:
packages: ninja-build libgl1-mesa-dev libpulse-dev libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-shape0 libxcb-util1 libxcb-xinerama0 libxkbcommon-x11-0 libxcb-cursor-dev clazy libfuse-dev libgstreamer-gl1.0-0 libgstreamer-plugins-base1.0-0
version: 1.0

# Windows deps
- name: Install windows deps
if: runner.os == 'Windows'
run: |
vcpkg install doctest:x64-mingw-dynamic trompeloeil:x64-mingw-dynamic
echo cmake_extra_args="'-DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake' '-DMINGW=ON' '-G MinGW Makefiles'" >> "$GITHUB_ENV"
shell: bash

# Qt
- name: Install Qt
uses: jurplel/install-qt-action@v3
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: AppImage

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

on:
push:
branches: [ "master", "qe3" ]
Expand All @@ -8,8 +12,8 @@ on:

jobs:
ubuntu-qe3:
name: Qt 6.5 / Ubuntu 20.04
runs-on: ubuntu-20.04
name: Qt 6.5 / Ubuntu 22.04
runs-on: ubuntu-22.04
steps:
- name: Clone the repository
uses: actions/checkout@v3
Expand All @@ -19,7 +23,11 @@ jobs:
- name: Setup CMake
uses: ./.github/actions/cmake
with:
qt_version: 6.5.2
use_qt6: ON
modules: qtserialport qtmultimedia
additional_cmake_args: -DCMAKE_INSTALL_PREFIX='${{ github.workspace }}/install/usr'

- name: Create AppImage
uses: ./.github/actions/appimage

3 changes: 3 additions & 0 deletions .github/workflows/installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ jobs:
- name: Setup CMake
uses: ./.github/actions/cmake
with:
qt_version: 6.5.2
qt_arch: win64_mingw
use_qt6: ON
modules: qtserialport qtmultimedia
additional_cmake_args: -DCMAKE_INSTALL_PREFIX='${{ github.workspace }}/install'

- name: Build
Expand Down

0 comments on commit 5928dbc

Please sign in to comment.