Try to fix workflows for qt6

azagaya · Oct 10, 2024 · c7bed7d · c7bed7d
1 parent ee01ead
commit c7bed7d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/.github/workflows/laigter-linux.yaml b/.github/workflows/laigter-linux.yaml
@@ -11,21 +11,29 @@ jobs:
     - name: checkout sources
       uses: actions/checkout@v2
 
-    - name: add build dependencies
+    - name: Install Dependencies
+      shell: bash
       run: |
-        apt update
-        apt install -y software-properties-common clang make wget libomp-dev
-        add-apt-repository ppa:beineri/opt-qt-5.15.2-focal
-        apt-get update
-        apt install -y qt515base qt515x11extras qt515tools libgl1-mesa-dev qt515imageformats
-        
-    - name: build Laigter
+        apt-get update && apt-get install -y sudo
+        sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: '6.8.0'
+        arch: 'linux_gcc_64'
+        extra: '--external 7z'
+        modules: 'qtimageformats'
+        setup-python: 'false'
+
+    - name: Build Laigter
       shell: bash
       run: |
         echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
         source /opt/qt*/bin/qt*-env.sh || true
         export CXX=clang++
-        /opt/qt515/bin/qmake -spec linux-clang CONFIG+=release PREFIX=/usr
+        qmake -spec linux-clang CONFIG+=release PREFIX=/usr
         make -j$(nproc)
         make INSTALL_ROOT=appdir install
         find appdir/

diff --git a/.github/workflows/laigter-mac.yaml b/.github/workflows/laigter-mac.yaml
@@ -7,17 +7,18 @@ jobs:
     steps:
     - name: checkout sources
       uses: actions/checkout@v2
-    - name: setup Homebrew
-      shell: bash
-      run: |
-        rm /usr/local/bin/2to3* 
-        export HOMEBREW_NO_AUTO_UPDATE=1 && export HOMEBREW_NO_INSTALL_CLEANUP=1 && brew update
-        HOMEBREW_VERBOSE_USING_DOTS=1 brew reinstall --verbose qt@5
-        brew link qt@5 --force
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: '6.8.0'
+        extra: '--external 7z'
+        arch: 'clang_64'
+        modules: 'qtimageformats'
+
     - name: build Laigter
       shell: bash
       run: |
-        export PATH="/usr/local/opt/qt@5/bin:$PATH"
         qmake CONFIG+=release PREFIX=/usr
         make -j$(nproc)
         make INSTALL_ROOT=appdir install

diff --git a/.github/workflows/laigter-windows.yaml b/.github/workflows/laigter-windows.yaml
@@ -11,12 +11,15 @@ jobs:
       uses: actions/checkout@v2
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v2
+      uses: jurplel/install-qt-action@v4
       with:
-        version: '5.15.2'
-        modules: 'imageformats'
-        arch: win64_mingw81
+        aqtversion: '==3.1.*'
+        version: '6.8.0'
+        arch: win64_mingw
         extra: '--external 7z'
+        target: 'desktop'
+        host: 'windows'
+        modules: 'qtimageformats'
 
     - name: Build Laigter
       shell: cmd