Update Actions

.github/workflows/build.yml

@@ -3,15 +3,23 @@
 
 name: Build qmake
 
-on: [push]
+on:
+  push:
+    branches-ignore:
+      - master
+
+  pull_request:
+    branches:
+      - master
+    types: [opened, synchronize, reopened]
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        qt_version: [5.12.12, 5.13.2, 5.14.2, 5.15.2, 6.2.4, 6.3.2, 6.4.3, 6.5.3, 6.6.3, 6.7.3, 6.8.2]
+        qt_version: [5.12.12, 5.13.2, 5.14.2, 5.15.2, 6.2.4, 6.3.2, 6.4.3, 6.5.3, 6.6.3, 6.7.3, 6.8.2, 6.9.0]
 
 # =================================
 
@@ -29,6 +37,7 @@ jobs:
       with:
         version: ${{ matrix.qt_version }}
         cache: true
+        aqtversion: ==3.2.*
 
     - name: Install Qt6
       if: startsWith(matrix.qt_version, '6')
@@ -37,6 +46,7 @@ jobs:
         version: ${{ matrix.qt_version }}
         modules: qtmultimedia qtimageformats
         cache: true
+        aqtversion: ==3.2.*
 
     - name: ccache
       uses: hendrikmuhs/[email protected]
@@ -87,7 +97,6 @@ jobs:
       run: |
         mkdir build
         cd build
-        # workaround for https://bugreports.qt.io/browse/QTBUG-117225
         qmake ../WPanda.pro -early QMAKE_DEFAULT_LIBDIRS=$(xcrun -show-sdk-path)/usr/lib
         make -j3
 

.github/workflows/build_cmake.yml

@@ -3,15 +3,23 @@
 
 name: Build CMake
 
-on: [push]
+on:
+  push:
+    branches-ignore:
+      - master
+
+  pull_request:
+    branches:
+      - master
+    types: [opened, synchronize, reopened]
 
 jobs:
   build_cmake:
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        qt_version: [5.12.12, 5.13.2, 5.14.2, 5.15.2, 6.2.4, 6.3.2, 6.4.3, 6.5.3, 6.6.3, 6.7.3, 6.8.2]
+        qt_version: [5.12.12, 5.13.2, 5.14.2, 5.15.2, 6.2.4, 6.3.2, 6.4.3, 6.5.3, 6.6.3, 6.7.3, 6.8.2, 6.9.0]
 
 # =================================
 
@@ -29,6 +37,11 @@ jobs:
       with:
         version: ${{ matrix.qt_version }}
         cache: true
+        aqtversion: ==3.2.*
+
+    - name: Install CUPS dependency for Qt 6.7.*
+      if: matrix.os == 'ubuntu-latest' && startsWith(matrix.qt_version, '6.7')
+      run: sudo apt update && sudo apt install -y libcups2-dev
 
     - name: Install Qt6
       if: startsWith(matrix.qt_version, '6')
@@ -37,6 +50,7 @@ jobs:
         version: ${{ matrix.qt_version }}
         modules: qtmultimedia qtimageformats
         cache: true
+        aqtversion: ==3.2.*
 
     - name: ccache
       uses: hendrikmuhs/[email protected]

.github/workflows/codeql.yml

@@ -5,7 +5,8 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: 
+      - master
 
 jobs:
   analyze:
@@ -33,6 +34,7 @@ jobs:
       with:
         version: 5.15.2
         cache: true
+        aqtversion: ==3.2.*
 
     - name: ccache
       uses: hendrikmuhs/[email protected]

.github/workflows/coverage.yml

@@ -6,7 +6,7 @@ name: Coverage
 on:
   push:
     branches: 
-     - 'master'
+      - master
 
 jobs:
   Ubuntu-Qt5_15_2-Code_Coverage:
@@ -23,6 +23,7 @@ jobs:
       with:
         version: 5.15.2
         cache: true
+        aqtversion: ==3.2.*
 
     - name: ccache
       uses: hendrikmuhs/[email protected]

.github/workflows/deploy.yml

@@ -35,13 +35,15 @@ jobs:
         version: 5.15.2
         cache: true
         arch: win32_msvc2019
+        aqtversion: ==3.2.*
 
     - name: Install Qt5 64bit
       if: matrix.os != 'windows-latest'
       uses: jurplel/install-qt-action@v4
       with:
         version: 5.15.2
         cache: true
+        aqtversion: ==3.2.*
 
     - name: ccache
       uses: hendrikmuhs/[email protected]

CMakeLists.txt

@@ -46,7 +46,11 @@ if(CCACHE_BIN)
     set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_BIN})
 endif()
 
-set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
+if (QT_VERSION_MAJOR EQUAL 5)
+    set(CMAKE_OSX_ARCHITECTURES "x86_64")
+else()
+    set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
+endif()
 
 include(CMakeSources.cmake)