Skip to content

Commit

Permalink
update github build file to support Qt6
Browse files Browse the repository at this point in the history
  • Loading branch information
Murmele committed Oct 8, 2023
1 parent ca253a8 commit c8df519
Showing 1 changed file with 4 additions and 21 deletions.
25 changes: 4 additions & 21 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,7 @@ jobs:
fail-fast: false
matrix:
qt:
- version: 5.15.2
check_only: false

- version: 5.12.0
check_only: true
- version: 6.5

env:
- name: linux
Expand Down Expand Up @@ -209,7 +205,6 @@ jobs:
- name: Install Qt
uses: jurplel/[email protected]
timeout-minutes: 10
if: "!matrix.qt.check_only"
with:
version: ${{ matrix.qt.version }}
target: desktop
Expand All @@ -218,18 +213,6 @@ jobs:
install-deps: true
modules: qtwebengine

- name: Install Qt
uses: jurplel/[email protected]
timeout-minutes: 10
if: matrix.qt.check_only
with:
version: ${{ matrix.qt.version }}
target: desktop
host: ${{ matrix.env.qt_platform }}
arch: ${{ matrix.env.qt_arch_check_only }}
install-deps: true
modules: qtwebengine

- name: Install Ninja
uses: seanmiddleditch/gha-setup-ninja@v3
with:
Expand Down Expand Up @@ -290,7 +273,7 @@ jobs:
# Command copied from flathub build process
- name: Validate appdata file
if: matrix.env.ninja_platform == 'linux' && !matrix.qt.check_only
if: matrix.env.ninja_platform == 'linux'
run: |
echo "Show generated appdata file"
cat ./build/release/rsrc/linux/com.github.Murmele.Gittyup.appdata.xml
Expand All @@ -301,14 +284,14 @@ jobs:
flatpak run --env=G_DEBUG=fatal-criticals org.freedesktop.appstream-glib validate ./build/release/rsrc/linux/com.github.Murmele.Gittyup.appdata.xml
- name: Publish build artifacts
if: matrix.env.pack && !matrix.qt.check_only
if: matrix.env.pack
uses: actions/upload-artifact@v3
with:
path: build/release/pack/Gittyup-*
name: Gittyup ${{ matrix.env.name }}

- name: Publish version file
if: matrix.env.pack && !matrix.qt.check_only
if: matrix.env.pack
uses: actions/upload-artifact@v3
with:
path: build/release/VERSION.txt
Expand Down

0 comments on commit c8df519

Please sign in to comment.