From b36cbf7cb49a615b2c81a7749959d41a722a4926 Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter@edelhirsch.io>
Date: Tue, 19 Apr 2022 11:00:44 +0200
Subject: [PATCH] CI system: Also build for current Qt version (currently 6.3)

Resolves #180
---
 .github/workflows/qmake.yml | 119 ++++++++++++++++++++++++++++++++++++
 1 file changed, 119 insertions(+)

diff --git a/.github/workflows/qmake.yml b/.github/workflows/qmake.yml
index 790d8c9d..cc35815a 100644
--- a/.github/workflows/qmake.yml
+++ b/.github/workflows/qmake.yml
@@ -69,6 +69,46 @@ jobs:
         set-env: 'true'
         tools-only: 'false'
 
+    - name: Install needed xkbcommon symlink
+      run: sudo apt-get install libxkbcommon-dev -y
+    - name: Ubuntu and Qt version
+      run: |
+        cat /etc/issue
+        echo number of processors: $(nproc)
+        qmake -v
+    - name: qmake
+      run: qmake qskinny.pro
+    - name: make
+      run: make -j$(nproc)
+
+  build-linux-qt-current:
+    name: Linux Qt 6.3 (current) build
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Cache Qt
+      id: cache-qt-6-3
+      uses: actions/cache@v1  # not v2!
+      with:
+        path: ../Qt/6.3.0
+        key: ${{ runner.os }}-QtCache-Qt6-3
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v2
+      with:
+        version: '6.3.0'
+        host: 'linux'
+        target: 'desktop'
+        install-deps: 'true'
+        modules: 'qtwebengine'
+        cached: ${{ steps.cache-qt-6-3.outputs.cache-hit }}
+        setup-python: 'true'
+        tools: ''
+        set-env: 'true'
+        tools-only: 'false'
+
+    - name: Install needed xkbcommon symlink
+      run: sudo apt-get install libxkbcommon-dev -y
     - name: Ubuntu and Qt version
       run: |
         cat /etc/issue
@@ -165,6 +205,49 @@ jobs:
         unzip jom.zip
         .\jom
 
+  build-windows-qt-current:
+    name: Windows Qt 6.3 (current) build
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Cache Qt
+      id: cache-qt-6-3
+      uses: actions/cache@v1  # not v2!
+      with:
+        path: ../Qt/6.3.0
+        key: ${{ runner.os }}-QtCache-Qt6-3
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v2
+      with:
+        version: '6.3.0'
+        host: 'windows'
+        target: 'desktop'
+        arch: 'win64_msvc2019_64'
+        install-deps: 'true'
+        modules: 'qtwebengine'
+        cached: ${{ steps.cache-qt-6-3.outputs.cache-hit }}
+        setup-python: 'true'
+        tools: ''
+        set-env: 'true'
+        tools-only: 'false'
+
+    - uses: ilammy/msvc-dev-cmd@v1
+
+    - name: Windows and Qt version
+      run: |
+        systeminfo /fo csv | ConvertFrom-Csv | select OS*, System*, Hotfix* | Format-List
+        qmake -v
+
+    - name: qmake
+      run: qmake qskinny.pro
+
+    - name: jom
+      run: |
+        Invoke-WebRequest -Uri "https://download.qt.io/official_releases/jom/jom.zip" -OutFile jom.zip
+        unzip jom.zip
+        .\jom
+
   build-mac-qt5-15:
     name: MacOS Qt 5.15 build
     runs-on: macos-latest
@@ -236,3 +319,39 @@ jobs:
       run: qmake qskinny.pro
     - name: make
       run: make -j$(sysctl -n hw.ncpu)
+
+  build-mac-qt-current:
+    name: MacOS Qt 6.3 (current) build
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Cache Qt
+      id: cache-qt-6-3
+      uses: actions/cache@v1  # not v2!
+      with:
+        path: ../Qt/6.3.0
+        key: ${{ runner.os }}-QtCache-Qt6-3
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v2
+      with:
+        version: '6.3.0'
+        host: 'mac'
+        target: 'desktop'
+        install-deps: 'true'
+        modules: 'qtwebengine'
+        cached: ${{ steps.cache-qt-6-3.outputs.cache-hit }}
+        setup-python: 'true'
+        tools: ''
+        set-env: 'true'
+        tools-only: 'false'
+
+    - name: MacOS and Qt version
+      run: |
+        sw_vers
+        echo number of processors: $(sysctl -n hw.ncpu)
+        qmake -v
+    - name: qmake
+      run: qmake qskinny.pro
+    - name: make
+      run: make -j$(sysctl -n hw.ncpu)