Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
stiglers-eponym committed Jul 13, 2024
2 parents 6c310c3 + 8d4aa2f commit 4b2da68
Show file tree
Hide file tree
Showing 68 changed files with 534 additions and 470 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/MSYS2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: '🧰 Checkout'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -51,7 +51,7 @@ jobs:
makepkg-mingw --noconfirm --noprogressbar -sCLfp PKGBUILD_MSYS2_git
- name: '📤 Upload artifact: package'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.sys }}-BeamerPresenter-${{ matrix.renderer }}-qt${{ matrix.qt }}
path: ${{ github.workspace }}\mingw-w64-${{ matrix.env }}-beamerpresenter-${{ matrix.renderer }}-qt${{ matrix.qt }}-git-*.pkg.tar.zst
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/flatpak-builder-qt5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
options: --privileged
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build flatpak
uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
Expand All @@ -29,7 +29,7 @@ jobs:
run: mv BeamerPresenter.flatpak BeamerPresenter-Qt5.flatpak

- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/flatpak-builder-qt6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ on:

jobs:
flatpak:
name: "Flatpak Builder with Qt 6.4 and Poppler"
name: "Flatpak Builder with Qt 6.5 and Poppler"
runs-on: ubuntu-22.04
container:
image: bilelmoussaoui/flatpak-github-actions:kde-6.4
image: bilelmoussaoui/flatpak-github-actions:kde-6.5
options: --privileged
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Build flatpak
uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@v6
Expand All @@ -29,7 +29,7 @@ jobs:
run: mv BeamerPresenter.flatpak BeamerPresenter-Qt6.flatpak

- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/package-ubuntu-20.04-qt5-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand Down Expand Up @@ -80,10 +80,10 @@ jobs:
run: cmake --build build_dir

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3

- name: Archive performance analysis report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: codeql-report.sarif
path: /home/runner/work/BeamerPresenter/results/cpp.sarif
Expand All @@ -92,7 +92,7 @@ jobs:
run: cpack --config build_dir/CPackConfig.cmake

- name: Archive debian package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-full-qt5-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-full-qt5-x86_64.deb
14 changes: 7 additions & 7 deletions .github/workflows/package-ubuntu-20.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
workflow_dispatch:

env:
MUPDF_VERSION: 1.24.2
MUPDF_SHA256SUM: b86ba258c5cc6711367e4bbe2d283389a33ac19f00a513462f6c60d05b00601c
MUPDF_VERSION: 1.24.6
MUPDF_SHA256SUM: acbdbdc7c0f598aad1ef0fb29313cfe12200147b9ff3616f016370a9b63e9ea7

jobs:
package:
Expand All @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Dependencies
run: >
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
mv beamerpresenter-poppler-qt5-x86_64.deb beamerpresenter-poppler-qt5-focal-x86_64.deb
- name: Archive package with Qt5 + Poppler
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-poppler-qt5-focal-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-poppler-qt5-focal-x86_64.deb
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
mv beamerpresenter-mupdf-qt5-x86_64.deb beamerpresenter-mupdf-qt5-focal-x86_64.deb
- name: Archive package with Qt5 + MuPDF
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-qt5-focal-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-qt5-focal-x86_64.deb
Expand Down Expand Up @@ -164,14 +164,14 @@ jobs:
mv beamerpresenter-mupdf-small-qt5-x86_64.deb beamerpresenter-mupdf-small-qt5-focal-x86_64.deb
- name: Archive package with Qt5 + small MuPDF
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-small-qt5-focal-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-small-qt5-focal-x86_64.deb


- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/package-ubuntu-22.04-qt6-mupdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand Down Expand Up @@ -86,10 +86,10 @@ jobs:
run: cmake --build build_dir

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3

- name: Archive performance analysis report
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: codeql-report.sarif
path: /home/runner/work/BeamerPresenter/results/cpp.sarif
Expand All @@ -98,7 +98,7 @@ jobs:
run: cpack --config build_dir/CPackConfig.cmake

- name: Archive debian package
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-qt6-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-qt6-x86_64.deb
18 changes: 9 additions & 9 deletions .github/workflows/package-ubuntu-22.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
workflow_dispatch:

env:
MUPDF_VERSION: 1.24.2
MUPDF_SHA256SUM: b86ba258c5cc6711367e4bbe2d283389a33ac19f00a513462f6c60d05b00601c
MUPDF_VERSION: 1.24.6
MUPDF_SHA256SUM: acbdbdc7c0f598aad1ef0fb29313cfe12200147b9ff3616f016370a9b63e9ea7

jobs:
package:
Expand All @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Dependencies
run: >
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
mv beamerpresenter-poppler-qt5-x86_64.deb beamerpresenter-poppler-qt5-jammy-x86_64.deb
- name: Archive package with Qt5 + Poppler
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-poppler-qt5-jammy-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-poppler-qt5-jammy-x86_64.deb
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
mv beamerpresenter-mupdf-qt5-x86_64.deb beamerpresenter-mupdf-qt5-jammy-x86_64.deb
- name: Archive package with Qt5 + MuPDF
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-qt5-jammy-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-qt5-jammy-x86_64.deb
Expand Down Expand Up @@ -150,7 +150,7 @@ jobs:
mv beamerpresenter-mupdf-qt6-x86_64.deb beamerpresenter-mupdf-qt6-jammy-x86_64.deb
- name: Archive package with Qt6 + MuPDF
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-qt6-jammy-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-qt6-jammy-x86_64.deb
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
mv beamerpresenter-mupdf-small-qt5-x86_64.deb beamerpresenter-mupdf-small-qt5-jammy-x86_64.deb
- name: Archive package with Qt5 + small MuPDF
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-small-qt5-jammy-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-small-qt5-jammy-x86_64.deb
Expand Down Expand Up @@ -248,14 +248,14 @@ jobs:
mv beamerpresenter-mupdf-small-qt6-x86_64.deb beamerpresenter-mupdf-small-qt6-jammy-x86_64.deb
- name: Archive package with Qt6 + small MuPDF
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-small-qt6-jammy-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-small-qt6-jammy-x86_64.deb


- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/package-ubuntu-24.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
workflow_dispatch:

env:
MUPDF_VERSION: 1.24.2
MUPDF_SHA256SUM: b86ba258c5cc6711367e4bbe2d283389a33ac19f00a513462f6c60d05b00601c
MUPDF_VERSION: 1.24.6
MUPDF_SHA256SUM: acbdbdc7c0f598aad1ef0fb29313cfe12200147b9ff3616f016370a9b63e9ea7

jobs:
package:
Expand All @@ -17,7 +17,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Dependencies
run: >
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
mv beamerpresenter-poppler-qt5-x86_64.deb beamerpresenter-poppler-qt5-noble-x86_64.deb
- name: Archive package with Qt5 + Poppler
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-poppler-qt5-noble-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-poppler-qt5-noble-x86_64.deb
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
mv beamerpresenter-poppler-qt6-x86_64.deb beamerpresenter-poppler-qt6-noble-x86_64.deb
- name: Archive package with Qt6 + Poppler
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-poppler-qt6-noble-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-poppler-qt6-noble-x86_64.deb
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
mv beamerpresenter-mupdf-qt5-x86_64.deb beamerpresenter-mupdf-qt5-noble-x86_64.deb
- name: Archive package with Qt5 + MuPDF
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-qt5-noble-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-qt5-noble-x86_64.deb
Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
mv beamerpresenter-mupdf-qt6-x86_64.deb beamerpresenter-mupdf-qt6-noble-x86_64.deb
- name: Archive package with Qt6 + MuPDF
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-qt6-noble-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-qt6-noble-x86_64.deb
Expand Down Expand Up @@ -242,7 +242,7 @@ jobs:
mv beamerpresenter-mupdf-small-qt5-x86_64.deb beamerpresenter-mupdf-small-qt5-noble-x86_64.deb
- name: Archive package with Qt5 + small MuPDF
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-small-qt5-noble-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-small-qt5-noble-x86_64.deb
Expand Down Expand Up @@ -282,14 +282,14 @@ jobs:
mv beamerpresenter-mupdf-small-qt6-x86_64.deb beamerpresenter-mupdf-small-qt6-noble-x86_64.deb
- name: Archive package with Qt6 + small MuPDF
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: beamerpresenter-mupdf-small-qt6-noble-x86_64.deb
path: /home/runner/work/BeamerPresenter/BeamerPresenter/beamerpresenter-mupdf-small-qt6-noble-x86_64.deb


- name: Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
Expand Down
Loading

0 comments on commit 4b2da68

Please sign in to comment.