Merge branch 'master' into v3

jurplel · Aug 25, 2022 · 394303e · 394303e
2 parents 64bdb64 + c8ebe28
commit 394303e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 11 deletions.
diff --git a/action/package-lock.json b/action/package-lock.json
diff --git a/action/package.json b/action/package.json
@@ -17,7 +17,7 @@
   "license": "MIT",
   "dependencies": {
     "@actions/cache": "^3.0.0",
-    "@actions/core": "^1.7.0",
+    "@actions/core": "^1.9.1",
     "@actions/exec": "^1.1.0",
     "compare-versions": "^3.6.0",
     "glob": "^7.0.0"

diff --git a/action/src/main.ts b/action/src/main.ts
@@ -101,7 +101,11 @@ class Inputs {
           this.arch = "win64_msvc2017_64";
         }
       } else if (this.target === "android") {
-        this.arch = "android_armv7";
+        if (compareVersions(this.version, ">=", "5.14.0")) {
+          this.arch = "android";
+        } else {
+          this.arch = "android_armv7";
+        }
       }
     }