From 0e9d4fe9d5d5d743eeee9c03213aa3ad4748c914 Mon Sep 17 00:00:00 2001 From: Reinder Feenstra Date: Wed, 31 Aug 2022 18:50:01 +0200 Subject: [PATCH 1/2] CI: added client and server build for ubuntu 22.04 --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92030d00..231071f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,16 @@ jobs: build_deb: true defines: "" + - name: "ubuntu_22.04" + os: ubuntu-22.04 + generator: "Unix Makefiles" + arch: "" + target: traintastic-client + jobs: 2 + build_type: Release + build_deb: true + defines: "" + - name: "raspberrypios_arm7" os: [self-hosted, ARM, RaspberryPi] generator: "Unix Makefiles" @@ -166,6 +176,18 @@ jobs: defines: "" ccov: false + - name: "ubuntu_22.04" + os: ubuntu-22.04 + generator: "Unix Makefiles" + arch: "" + toolset: "" + target: all + jobs: 2 + build_type: Release + build_deb: true + defines: "" + ccov: false + - name: "ubuntu_20.04 (debug+ccov)" os: ubuntu-20.04 generator: "Unix Makefiles" From dcf6f0760142ed86457915b2a3c7f0a0c2b90afb Mon Sep 17 00:00:00 2001 From: Reinder Feenstra Date: Wed, 31 Aug 2022 19:01:07 +0200 Subject: [PATCH 2/2] CI: replace qt5-default package by qtbase5-dev-tools and qtbase5-dev --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 231071f2..615da2b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -97,7 +97,7 @@ jobs: # Ubuntu only: - name: Install packages if: startswith(matrix.config.os, 'ubuntu') - run: sudo apt install qt5-default libqt5svg5-dev + run: sudo apt install qtbase5-dev qtbase5-dev-tools libqt5svg5-dev # All: - name: Create Build Environment