From fe28ff130a316c84fbd9de6a37b234494dce6f8b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Aug 2022 20:00:05 +0000 Subject: [PATCH 1/3] Bump @actions/core from 1.9.0 to 1.9.1 in /action Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.9.0 to 1.9.1. - [Release notes](https://github.com/actions/toolkit/releases) - [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core) --- updated-dependencies: - dependency-name: "@actions/core" dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- action/package-lock.json | 35 ++++++++++++++++++++++++++--------- action/package.json | 2 +- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/action/package-lock.json b/action/package-lock.json index f61d832a..bc01ffe0 100644 --- a/action/package-lock.json +++ b/action/package-lock.json @@ -10,7 +10,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" @@ -45,11 +45,20 @@ } }, "node_modules/@actions/core": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.0.tgz", - "integrity": "sha512-5pbM693Ih59ZdUhgk+fts+bUWTnIdHV3kwOSr+QIoFHMLg7Gzhwm0cifDY/AG68ekEJAkHnQVpcy4f6GjmzBCA==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz", + "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==", "dependencies": { - "@actions/http-client": "^2.0.1" + "@actions/http-client": "^2.0.1", + "uuid": "^8.3.2" + } + }, + "node_modules/@actions/core/node_modules/uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", + "bin": { + "uuid": "dist/bin/uuid" } }, "node_modules/@actions/exec": { @@ -2218,11 +2227,19 @@ } }, "@actions/core": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.0.tgz", - "integrity": "sha512-5pbM693Ih59ZdUhgk+fts+bUWTnIdHV3kwOSr+QIoFHMLg7Gzhwm0cifDY/AG68ekEJAkHnQVpcy4f6GjmzBCA==", + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.9.1.tgz", + "integrity": "sha512-5ad+U2YGrmmiw6du20AQW5XuWo7UKN2052FjSV7MX+Wfjf8sCqcsZe62NfgHys4QI4/Y+vQvLKYL8jWtA1ZBTA==", "requires": { - "@actions/http-client": "^2.0.1" + "@actions/http-client": "^2.0.1", + "uuid": "^8.3.2" + }, + "dependencies": { + "uuid": { + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" + } } }, "@actions/exec": { diff --git a/action/package.json b/action/package.json index 26abcc59..4f11e604 100644 --- 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" From 90806b057ef985d05aff0b9e45324eb8b6783b30 Mon Sep 17 00:00:00 2001 From: Benjamin O Date: Wed, 24 Aug 2022 18:39:01 -0400 Subject: [PATCH 2/3] Add simple fix to #161 --- action/src/main.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/action/src/main.ts b/action/src/main.ts index 7773d232..aef6b350 100644 --- 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"; + } } } From c8ebe28639c7adaa809f4902266be0ce9a433e44 Mon Sep 17 00:00:00 2001 From: Benjamin O Date: Wed, 24 Aug 2022 18:43:25 -0400 Subject: [PATCH 3/3] Forgot semicolon --- action/src/main.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/action/src/main.ts b/action/src/main.ts index aef6b350..1da27e2e 100644 --- a/action/src/main.ts +++ b/action/src/main.ts @@ -102,7 +102,7 @@ class Inputs { } } else if (this.target === "android") { if (compareVersions(this.version, ">=", "5.14.0")) { - this.arch = "android" + this.arch = "android"; } else { this.arch = "android_armv7"; }