chore: update the file

x-tools-author · Oct 2, 2024 · 7a4e430 · 7a4e430
1 parent 5d2f6f6
commit 7a4e430
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -1,11 +1,11 @@
 name: build-android
-# on:
-#   schedule:
-#     - cron: '0 0 * * *'
 on:
- push:
-   branches:
-     - master
+  schedule:
+    - cron: '0 0 * * *'
+# on:
+#  push:
+#    branches:
+#      - master
 env:
   QT_VERSION: 6.8.0
   QT_MODULES: 'qtcharts qtserialbus qtserialport qtwebsockets'
@@ -29,15 +29,15 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           target: desktop
-          arch: win64_mingw
+          arch: win64_llvm_mingw
           host: windows
           dir: ${{ github.workspace }}
           modules: ${{env.QT_MODULES}}
           version: "${{env.QT_VERSION}}"
       - name: CMake for Android
         shell: cmd
         run: |
-          set JAVA_HOME=%JAVA_HOME_11_X64%
+          set JAVA_HOME=%JAVA_HOME_17_X64%
           ${{ github.workspace }}\Qt\${{env.QT_VERSION}}\android_armv7\bin\qt-cmake.bat ^
           -G "MinGW Makefiles" ^
           -S . ^
@@ -55,7 +55,7 @@ jobs:
       - name: Build for android
         shell: cmd
         run: |
-          set JAVA_HOME=%JAVA_HOME_11_X64%
+          set JAVA_HOME=%JAVA_HOME_17_X64%
           echo %JAVA_HOME%
           cmake --build build\armeabi_v7a --target xTools --config Release
       - name: Directory of build\armeabi_v7a
@@ -64,7 +64,7 @@ jobs:
       - name: Deploy for Android
         shell: cmd
         run: |
-          set JAVA_HOME=%JAVA_HOME_11_X64%
+          set JAVA_HOME=%JAVA_HOME_17_X64%
           echo %JAVA_HOME%
           ${{ github.workspace }}\Qt\${{env.QT_VERSION}}\mingw_64\bin\androiddeployqt.exe ^
           --input build\armeabi_v7a\android-xTools-deployment-settings.json ^

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -1,25 +1,25 @@
 name: build-macos
+# on:
+#   schedule:
+#     - cron: '0 0 * * *'
 on:
-  schedule:
-    - cron: '0 0 * * *'
-#on:
-#  push:
-#    branches:
-#      - master
+ push:
+   branches:
+     - master
 jobs:
   build:
     name: Build
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [macos-12]
-        version: [5.15.2, 6.7.3]
+        version: [6.8.*]
         arch: [clang_64]
         include:
           - version: 5.15.2
             cmake-prefix-path: 'lib/cmake/Qt5'
             modules: 'qtcharts'
-          - version: 6.7.3
+          - version: 6.8.*
             cmake-prefix-path: 'lib/cmake/Qt6'
             moudles: 'qtcharts qtserialbus qtserialport qtwebsockets'
     steps: