Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update github-actions CI to include more configurations #230

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions .github/workflows/arch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: archlinux

on:
push:
branches: [master]
pull_request:
branches: [master]

jobs:
build:
runs-on: ubuntu-latest
container:
image: archlinux:latest
strategy:
matrix:
buildtype: [Debug, Release]
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 3
- run: >
pacman -Sy --noconfirm
base-devel
git
boost-libs boost
qt5-base qt5-tools
poppler-qt5
cmake
xorg-server-xvfb
- run: >
cmake -B build/
-DCMAKE_VERBOSE_MAKEFILE=ON
-DUsePrerenderedPDF=ON
-DCodeCoverage=ON
-DWarningAsError=ON
-DCMAKE_BUILD_TYPE=${{matrix.buildtype}}
.
- run: cmake --build build/
- name: run tests within xvfb
working-directory: build/
run: >
xvfb-run -a -s '-screen 0 1920x1080x24 -screen 1 1920x1200x24'
ctest --output-on-failure --timeout 60
- name: upload coverage
run: bash <(curl -s https://codecov.io/bash)
1 change: 1 addition & 0 deletions .github/workflows/clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
-DCMAKE_VERBOSE_MAKEFILE=ON
-DUsePrerenderedPDF=ON
-DCodeCoverage=ON
-DWarningAsError=ON
-DCMAKE_BUILD_TYPE=${{matrix.buildtype}}
.
- run: cmake --build build/
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
PKG_CONFIG_PATH: /usr/local/opt/poppler-qt5/lib/pkgconfig:/usr/local/opt/poppler-qt5/share/pkgconfig
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 3
- run: brew install boost
- run: brew install poppler-qt5
- name: cmake -B build/
Expand All @@ -28,6 +30,7 @@ jobs:
-DCodeCoverage=ON
-DCMAKE_BUILD_TYPE=${{matrix.buildtype}}
-DRunDualScreenTests=OFF
-DWarningAsError=ON
.
- run: cmake --build build/
- run: ctest --output-on-failure --timeout 60
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04 ]
os: [ ubuntu-20.04, ubuntu-22.04 ]
buildtype: [ Debug, Release ]
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 3
- run: sudo apt-get update
- name: Install build deps
run: >
Expand All @@ -31,6 +33,7 @@ jobs:
-DCMAKE_VERBOSE_MAKEFILE=ON
-DUsePrerenderedPDF=ON
-DCodeCoverage=ON
-DWarningAsError=ON
-DCMAKE_BUILD_TYPE=${{matrix.buildtype}}
.
- run: cmake --build build/
Expand Down
4 changes: 2 additions & 2 deletions dspdfviewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ DSPDFViewer::DSPDFViewer(const RuntimeConfiguration& r):
renderFactory(r),
m_pagenumber(0),
audienceWindow(1, r.useFullPage() ? PagePart::FullPage : PagePart::LeftHalf , false, r, WindowRole::AudienceWindow),
secondaryWindow(0, (r.useFullPage() | r.duplicate())? PagePart::FullPage : PagePart::RightHalf, true , r, WindowRole::PresenterWindow, r.useSecondScreen())
secondaryWindow(0, (r.useFullPage() || r.duplicate())? PagePart::FullPage : PagePart::RightHalf, true , r, WindowRole::PresenterWindow, r.useSecondScreen())
{
DEBUGOUT << tr("Starting constructor") ;

Expand Down Expand Up @@ -307,7 +307,7 @@ RenderingIdentifier DSPDFViewer::toRenderIdent(unsigned int pageNumber, const PD

RenderingIdentifier DSPDFViewer::toThumbnailRenderIdent(unsigned int pageNumber, PDFViewerWindow& window)
{
QSize newSize = window.getPreviewImageSize();;
QSize newSize = window.getPreviewImageSize();
static QSize thumbnailSize;
if ( thumbnailSize != newSize ) {
DEBUGOUT << "Thumbnail size changed from" << thumbnailSize << "to" << newSize;
Expand Down