Merge branch 'master' into v4

jurplel · Nov 11, 2024 · f43aacf · f43aacf
2 parents f45d390 + 09d1e79
commit f43aacf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/test-android.yml b/.github/workflows/test-android.yml
@@ -11,7 +11,7 @@ jobs:
         os:
           - ubuntu-22.04
           - windows-2022
-          - macos-12
+          - macos-15
         qt:
           - version: "5.15.2"
             ndk-version: r21e

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -33,9 +33,9 @@ jobs:
           - ubuntu-20.04
           - windows-2022
           - windows-2019
-          - macos-12
           - macos-13
           - macos-14
+          - macos-15
         aqtversion:
           - null  # use whatever the default is
         src-doc-examples:

diff --git a/action/src/main.ts b/action/src/main.ts
@@ -186,7 +186,7 @@ class Inputs {
           this.arch = "android_armv7";
         }
       } else if (this.host === "windows") {
-        if (compareVersions(this.version, ">=", "6.7.3")) {
+        if (compareVersions(this.version, ">=", "6.8.0")) {
           this.arch = "win64_msvc2022_64";
         } else if (compareVersions(this.version, ">=", "5.15.0")) {
           this.arch = "win64_msvc2019_64";