From bc9cd3301f2444179bccbc04e8ac78a74cab218b Mon Sep 17 00:00:00 2001 From: Michihiro Ikeda Date: Wed, 29 May 2024 10:51:30 +0900 Subject: [PATCH 1/2] Update Node.js from v16 to v20 (#84) * Update Node.js from v16 to v20 According to the release policy of Node.js, Node.js v16 reached EOL (end-of-life). https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/ --- .github/workflows/test.yml | 8 +++---- emulator-run-cmd/action.yml | 2 +- emulator-run-cmd/package-lock.json | 36 ++++++++++++++++++++++-------- emulator-run-cmd/package.json | 2 +- install-sdk/action.yml | 2 +- install-sdk/package-lock.json | 36 ++++++++++++++++++++++-------- install-sdk/package.json | 2 +- prepare-for-release.sh | 2 +- 8 files changed, 63 insertions(+), 27 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index df295b50..9211c75f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,10 +11,10 @@ jobs: distribution: 'temurin' java-version: '17' - name: test install-sdk - run: npm config delete prefix && source ~/.nvm/nvm.sh && nvm install v16.15.0 && npm install && npm ci && npm run build + run: npm config delete prefix && source ~/.nvm/nvm.sh && nvm install v20.14.0 && npm install && npm ci && npm run build working-directory: install-sdk - name: test emulator-run-cmd - run: npm config delete prefix && source ~/.nvm/nvm.sh && nvm install v16.15.0 && npm install && npm ci && npm run build + run: npm config delete prefix && source ~/.nvm/nvm.sh && nvm install v20.14.0 && npm install && npm ci && npm run build working-directory: emulator-run-cmd - uses: ./install-sdk name: install sdk @@ -46,10 +46,10 @@ jobs: distribution: 'temurin' java-version: '17' - name: test install-sdk - run: npm config delete prefix && source ~/.nvm/nvm.sh && nvm install v16.15.0 && npm install && npm ci && npm run build + run: npm config delete prefix && source ~/.nvm/nvm.sh && nvm install v20.14.0 && npm install && npm ci && npm run build working-directory: install-sdk - name: test emulator-run-cmd - run: npm config delete prefix && source ~/.nvm/nvm.sh && nvm install v16.15.0 && npm install && npm ci && npm run build + run: npm config delete prefix && source ~/.nvm/nvm.sh && nvm install v20.14.0 && npm install && npm ci && npm run build working-directory: emulator-run-cmd - uses: ./install-sdk name: install sdk diff --git a/emulator-run-cmd/action.yml b/emulator-run-cmd/action.yml index e38838a5..f9e7a639 100644 --- a/emulator-run-cmd/action.yml +++ b/emulator-run-cmd/action.yml @@ -30,5 +30,5 @@ inputs: description: 'be verbose' default: 'false' runs: - using: 'node16' + using: 'node20' main: 'lib/main.js' diff --git a/emulator-run-cmd/package-lock.json b/emulator-run-cmd/package-lock.json index c54815ba..ef37d992 100644 --- a/emulator-run-cmd/package-lock.json +++ b/emulator-run-cmd/package-lock.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@types/jest": "^28.1.4", - "@types/node": "^16.10.0", + "@types/node": "^20.12.12", "jest": "^28.1.2", "jest-circus": "^28.1.2", "ts-jest": "^28.0.5", @@ -1063,10 +1063,13 @@ } }, "node_modules/@types/node": { - "version": "16.11.43", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.43.tgz", - "integrity": "sha512-GqWykok+3uocgfAJM8imbozrqLnPyTrpFlrryURQlw1EesPUCx5XxTiucWDSFF9/NUEXDuD4bnvHm8xfVGWTpQ==", - "dev": true + "version": "20.12.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", + "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/prettier": { "version": "2.6.3", @@ -3400,6 +3403,12 @@ "node": ">=4.2.0" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/update-browserslist-db": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz", @@ -4378,10 +4387,13 @@ } }, "@types/node": { - "version": "16.11.43", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.43.tgz", - "integrity": "sha512-GqWykok+3uocgfAJM8imbozrqLnPyTrpFlrryURQlw1EesPUCx5XxTiucWDSFF9/NUEXDuD4bnvHm8xfVGWTpQ==", - "dev": true + "version": "20.12.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", + "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", + "dev": true, + "requires": { + "undici-types": "~5.26.4" + } }, "@types/prettier": { "version": "2.6.3", @@ -6108,6 +6120,12 @@ "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", "dev": true }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "update-browserslist-db": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz", diff --git a/emulator-run-cmd/package.json b/emulator-run-cmd/package.json index 80b80dbe..a66a82ec 100644 --- a/emulator-run-cmd/package.json +++ b/emulator-run-cmd/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@types/jest": "^28.1.4", - "@types/node": "^16.10.0", + "@types/node": "^20.12.12", "jest": "^28.1.2", "jest-circus": "^28.1.2", "ts-jest": "^28.0.5", diff --git a/install-sdk/action.yml b/install-sdk/action.yml index bb333802..3571c169 100644 --- a/install-sdk/action.yml +++ b/install-sdk/action.yml @@ -9,5 +9,5 @@ inputs: description: 'do you accept all current Android licenses?' default: 'yes' runs: - using: 'node16' + using: 'node20' main: 'lib/main.js' diff --git a/install-sdk/package-lock.json b/install-sdk/package-lock.json index 026ed0d6..6c46e1f4 100644 --- a/install-sdk/package-lock.json +++ b/install-sdk/package-lock.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@types/jest": "^28.1.4", - "@types/node": "^16.10.0", + "@types/node": "^20.12.12", "jest": "^28.1.2", "jest-circus": "^28.1.2", "ts-jest": "^28.0.5", @@ -1063,10 +1063,13 @@ } }, "node_modules/@types/node": { - "version": "16.11.43", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.43.tgz", - "integrity": "sha512-GqWykok+3uocgfAJM8imbozrqLnPyTrpFlrryURQlw1EesPUCx5XxTiucWDSFF9/NUEXDuD4bnvHm8xfVGWTpQ==", - "dev": true + "version": "20.12.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", + "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/prettier": { "version": "2.6.3", @@ -3400,6 +3403,12 @@ "node": ">=4.2.0" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/update-browserslist-db": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz", @@ -4378,10 +4387,13 @@ } }, "@types/node": { - "version": "16.11.43", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.43.tgz", - "integrity": "sha512-GqWykok+3uocgfAJM8imbozrqLnPyTrpFlrryURQlw1EesPUCx5XxTiucWDSFF9/NUEXDuD4bnvHm8xfVGWTpQ==", - "dev": true + "version": "20.12.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", + "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", + "dev": true, + "requires": { + "undici-types": "~5.26.4" + } }, "@types/prettier": { "version": "2.6.3", @@ -6108,6 +6120,12 @@ "integrity": "sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==", "dev": true }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "update-browserslist-db": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz", diff --git a/install-sdk/package.json b/install-sdk/package.json index 3783ddc2..f0b7cf73 100644 --- a/install-sdk/package.json +++ b/install-sdk/package.json @@ -25,7 +25,7 @@ }, "devDependencies": { "@types/jest": "^28.1.4", - "@types/node": "^16.10.0", + "@types/node": "^20.12.12", "jest": "^28.1.2", "jest-circus": "^28.1.2", "ts-jest": "^28.0.5", diff --git a/prepare-for-release.sh b/prepare-for-release.sh index 63e534b1..a32d7a04 100755 --- a/prepare-for-release.sh +++ b/prepare-for-release.sh @@ -3,5 +3,5 @@ set -ex for i in emulator-run-cmd install-sdk; do - (cd $i && docker run -it -v $(pwd):/opt/app -w /opt/app node:16 bash -c 'npm install && npm run build && npm prune --production' && git add -f node_modules lib) + (cd $i && docker run -it -v $(pwd):/opt/app -w /opt/app node:20 bash -c 'npm install && npm run build && npm prune --production' && git add -f node_modules lib) done From bb8a7b3a0d7e226b993971f5ce12a8b7df499b6f Mon Sep 17 00:00:00 2001 From: Michihiro Ikeda Date: Wed, 29 May 2024 12:38:08 +0900 Subject: [PATCH 2/2] fix test-ubuntu-latest fail --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9211c75f..ac285101 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,6 +31,7 @@ jobs: tag: default abi: x86 cmd: adb shell getprop + cmdOptions: -noaudio -no-boot-anim -no-window bootTimeout: 500 - uses: actions/upload-artifact@v1 with: