From f55d9bd4d29a4337fe90c087a3cf048455f2c85c Mon Sep 17 00:00:00 2001 From: shimataro Date: Mon, 27 Jan 2020 06:03:22 +0900 Subject: [PATCH 1/3] Bugfix/node modules (#100) * * clean node_modules before "npm ci --only=production" in order not to add ".bin" directory * * update CHANGELOG --- CHANGELOG.md | 6 +++++- scripts/create-release-branch.sh | 1 + scripts/rebuild.sh | 1 + scripts/update-dependencies.sh | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc4e40c..d1bcb80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,11 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Fixed + +* `node_modules/.bin` error (thanks [@george3447](https://github.com/george3447)) + ## [1.6.3] - 2020-01-27 ### Others -* add FAQ +* add Q&A ## [1.6.2] - 2020-01-25 diff --git a/scripts/create-release-branch.sh b/scripts/create-release-branch.sh index b1cffcf..b661d25 100755 --- a/scripts/create-release-branch.sh +++ b/scripts/create-release-branch.sh @@ -119,6 +119,7 @@ function update_package_version() { } function update_dependencies_version() { + rm -rf node_modules npm ci npm run check-updates -- -u } diff --git a/scripts/rebuild.sh b/scripts/rebuild.sh index 8301938..b2c853a 100755 --- a/scripts/rebuild.sh +++ b/scripts/rebuild.sh @@ -7,5 +7,6 @@ npm i npm run build npm run verify +rm -rf node_modules npm ci --only=production git add node_modules package-lock.json lib diff --git a/scripts/update-dependencies.sh b/scripts/update-dependencies.sh index afdd77e..1463fdb 100755 --- a/scripts/update-dependencies.sh +++ b/scripts/update-dependencies.sh @@ -25,6 +25,7 @@ npm run build npm run verify # commit +rm -rf node_modules npm ci --only=production git add package.json package-lock.json node_modules git commit -m "update dependencies" From 1c3dfa5189d2873ba369ecde14786bcb6bdbb2c2 Mon Sep 17 00:00:00 2001 From: shimataro Date: Mon, 27 Jan 2020 06:12:28 +0900 Subject: [PATCH 2/3] * fix the timing of "rm -rf node_modules" (#101) --- scripts/create-release-branch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create-release-branch.sh b/scripts/create-release-branch.sh index b661d25..65b0f72 100755 --- a/scripts/create-release-branch.sh +++ b/scripts/create-release-branch.sh @@ -119,7 +119,6 @@ function update_package_version() { } function update_dependencies_version() { - rm -rf node_modules npm ci npm run check-updates -- -u } @@ -137,6 +136,7 @@ function build_package() { function commit_changes() { local VERSION=$1 + rm -rf node_modules npm ci --only=production git add CHANGELOG.md package.json package-lock.json node_modules lib git commit -m "version ${VERSION}" From f964ddc76d2c680906441d0a34b016fe0d4588ab Mon Sep 17 00:00:00 2001 From: shimataro Date: Mon, 27 Jan 2020 06:16:12 +0900 Subject: [PATCH 3/3] version 1.6.4 (#102) --- CHANGELOG.md | 5 ++++- node_modules/.bin/acorn | 1 - node_modules/.bin/eslint | 1 - node_modules/.bin/esparse | 1 - node_modules/.bin/esvalidate | 1 - node_modules/.bin/installed-package-contents | 1 - node_modules/.bin/is-ci | 1 - node_modules/.bin/js-yaml | 1 - node_modules/.bin/json5 | 1 - node_modules/.bin/markdown-it | 1 - node_modules/.bin/markdownlint | 1 - node_modules/.bin/mkdirp | 1 - node_modules/.bin/ncu | 1 - node_modules/.bin/npm-check-updates | 1 - node_modules/.bin/npm-packlist | 1 - node_modules/.bin/npm-run-all | 1 - node_modules/.bin/pacote | 1 - node_modules/.bin/pidtree | 1 - node_modules/.bin/rc | 1 - node_modules/.bin/rimraf | 1 - node_modules/.bin/run-p | 1 - node_modules/.bin/run-s | 1 - node_modules/.bin/semver | 1 - node_modules/.bin/tsc | 1 - node_modules/.bin/tsserver | 1 - node_modules/.bin/which | 1 - node_modules/.bin/window-size | 1 - node_modules/.bin/yamllint | 1 - package-lock.json | 2 +- package.json | 2 +- 30 files changed, 6 insertions(+), 30 deletions(-) delete mode 120000 node_modules/.bin/acorn delete mode 120000 node_modules/.bin/eslint delete mode 120000 node_modules/.bin/esparse delete mode 120000 node_modules/.bin/esvalidate delete mode 120000 node_modules/.bin/installed-package-contents delete mode 120000 node_modules/.bin/is-ci delete mode 120000 node_modules/.bin/js-yaml delete mode 120000 node_modules/.bin/json5 delete mode 120000 node_modules/.bin/markdown-it delete mode 120000 node_modules/.bin/markdownlint delete mode 120000 node_modules/.bin/mkdirp delete mode 120000 node_modules/.bin/ncu delete mode 120000 node_modules/.bin/npm-check-updates delete mode 120000 node_modules/.bin/npm-packlist delete mode 120000 node_modules/.bin/npm-run-all delete mode 120000 node_modules/.bin/pacote delete mode 120000 node_modules/.bin/pidtree delete mode 120000 node_modules/.bin/rc delete mode 120000 node_modules/.bin/rimraf delete mode 120000 node_modules/.bin/run-p delete mode 120000 node_modules/.bin/run-s delete mode 120000 node_modules/.bin/semver delete mode 120000 node_modules/.bin/tsc delete mode 120000 node_modules/.bin/tsserver delete mode 120000 node_modules/.bin/which delete mode 120000 node_modules/.bin/window-size delete mode 120000 node_modules/.bin/yamllint diff --git a/CHANGELOG.md b/CHANGELOG.md index d1bcb80..1525d69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [1.6.4] - 2020-01-27 + ### Fixed * `node_modules/.bin` error (thanks [@george3447](https://github.com/george3447)) @@ -75,7 +77,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. * First release. -[Unreleased]: https://github.com/shimataro/ssh-key-action/compare/v1.6.3...HEAD +[Unreleased]: https://github.com/shimataro/ssh-key-action/compare/v1.6.4...HEAD +[1.6.4]: https://github.com/shimataro/ssh-key-action/compare/v1.6.3...v1.6.4 [1.6.3]: https://github.com/shimataro/ssh-key-action/compare/v1.6.2...v1.6.3 [1.6.2]: https://github.com/shimataro/ssh-key-action/compare/v1.6.1...v1.6.2 [1.6.1]: https://github.com/shimataro/ssh-key-action/compare/v1.6.0...v1.6.1 diff --git a/node_modules/.bin/acorn b/node_modules/.bin/acorn deleted file mode 120000 index cf76760..0000000 --- a/node_modules/.bin/acorn +++ /dev/null @@ -1 +0,0 @@ -../acorn/bin/acorn \ No newline at end of file diff --git a/node_modules/.bin/eslint b/node_modules/.bin/eslint deleted file mode 120000 index 810e4bc..0000000 --- a/node_modules/.bin/eslint +++ /dev/null @@ -1 +0,0 @@ -../eslint/bin/eslint.js \ No newline at end of file diff --git a/node_modules/.bin/esparse b/node_modules/.bin/esparse deleted file mode 120000 index 7423b18..0000000 --- a/node_modules/.bin/esparse +++ /dev/null @@ -1 +0,0 @@ -../esprima/bin/esparse.js \ No newline at end of file diff --git a/node_modules/.bin/esvalidate b/node_modules/.bin/esvalidate deleted file mode 120000 index 16069ef..0000000 --- a/node_modules/.bin/esvalidate +++ /dev/null @@ -1 +0,0 @@ -../esprima/bin/esvalidate.js \ No newline at end of file diff --git a/node_modules/.bin/installed-package-contents b/node_modules/.bin/installed-package-contents deleted file mode 120000 index 4b296e7..0000000 --- a/node_modules/.bin/installed-package-contents +++ /dev/null @@ -1 +0,0 @@ -../@npmcli/installed-package-contents/index.js \ No newline at end of file diff --git a/node_modules/.bin/is-ci b/node_modules/.bin/is-ci deleted file mode 120000 index fe6aca6..0000000 --- a/node_modules/.bin/is-ci +++ /dev/null @@ -1 +0,0 @@ -../is-ci/bin.js \ No newline at end of file diff --git a/node_modules/.bin/js-yaml b/node_modules/.bin/js-yaml deleted file mode 120000 index 9dbd010..0000000 --- a/node_modules/.bin/js-yaml +++ /dev/null @@ -1 +0,0 @@ -../js-yaml/bin/js-yaml.js \ No newline at end of file diff --git a/node_modules/.bin/json5 b/node_modules/.bin/json5 deleted file mode 120000 index 217f379..0000000 --- a/node_modules/.bin/json5 +++ /dev/null @@ -1 +0,0 @@ -../json5/lib/cli.js \ No newline at end of file diff --git a/node_modules/.bin/markdown-it b/node_modules/.bin/markdown-it deleted file mode 120000 index 894bcdb..0000000 --- a/node_modules/.bin/markdown-it +++ /dev/null @@ -1 +0,0 @@ -../markdown-it/bin/markdown-it.js \ No newline at end of file diff --git a/node_modules/.bin/markdownlint b/node_modules/.bin/markdownlint deleted file mode 120000 index f2b1093..0000000 --- a/node_modules/.bin/markdownlint +++ /dev/null @@ -1 +0,0 @@ -../markdownlint-cli/markdownlint.js \ No newline at end of file diff --git a/node_modules/.bin/mkdirp b/node_modules/.bin/mkdirp deleted file mode 120000 index 017896c..0000000 --- a/node_modules/.bin/mkdirp +++ /dev/null @@ -1 +0,0 @@ -../mkdirp/bin/cmd.js \ No newline at end of file diff --git a/node_modules/.bin/ncu b/node_modules/.bin/ncu deleted file mode 120000 index 2bf26b2..0000000 --- a/node_modules/.bin/ncu +++ /dev/null @@ -1 +0,0 @@ -../npm-check-updates/bin/ncu \ No newline at end of file diff --git a/node_modules/.bin/npm-check-updates b/node_modules/.bin/npm-check-updates deleted file mode 120000 index c180ad7..0000000 --- a/node_modules/.bin/npm-check-updates +++ /dev/null @@ -1 +0,0 @@ -../npm-check-updates/bin/npm-check-updates \ No newline at end of file diff --git a/node_modules/.bin/npm-packlist b/node_modules/.bin/npm-packlist deleted file mode 120000 index b897e4a..0000000 --- a/node_modules/.bin/npm-packlist +++ /dev/null @@ -1 +0,0 @@ -../npm-packlist/bin/index.js \ No newline at end of file diff --git a/node_modules/.bin/npm-run-all b/node_modules/.bin/npm-run-all deleted file mode 120000 index 0424f3c..0000000 --- a/node_modules/.bin/npm-run-all +++ /dev/null @@ -1 +0,0 @@ -../npm-run-all/bin/npm-run-all/index.js \ No newline at end of file diff --git a/node_modules/.bin/pacote b/node_modules/.bin/pacote deleted file mode 120000 index e595831..0000000 --- a/node_modules/.bin/pacote +++ /dev/null @@ -1 +0,0 @@ -../pacote/lib/bin.js \ No newline at end of file diff --git a/node_modules/.bin/pidtree b/node_modules/.bin/pidtree deleted file mode 120000 index 42c3f06..0000000 --- a/node_modules/.bin/pidtree +++ /dev/null @@ -1 +0,0 @@ -../pidtree/bin/pidtree.js \ No newline at end of file diff --git a/node_modules/.bin/rc b/node_modules/.bin/rc deleted file mode 120000 index 48b3cda..0000000 --- a/node_modules/.bin/rc +++ /dev/null @@ -1 +0,0 @@ -../rc/cli.js \ No newline at end of file diff --git a/node_modules/.bin/rimraf b/node_modules/.bin/rimraf deleted file mode 120000 index 4cd49a4..0000000 --- a/node_modules/.bin/rimraf +++ /dev/null @@ -1 +0,0 @@ -../rimraf/bin.js \ No newline at end of file diff --git a/node_modules/.bin/run-p b/node_modules/.bin/run-p deleted file mode 120000 index 98a2c9c..0000000 --- a/node_modules/.bin/run-p +++ /dev/null @@ -1 +0,0 @@ -../npm-run-all/bin/run-p/index.js \ No newline at end of file diff --git a/node_modules/.bin/run-s b/node_modules/.bin/run-s deleted file mode 120000 index 5938622..0000000 --- a/node_modules/.bin/run-s +++ /dev/null @@ -1 +0,0 @@ -../npm-run-all/bin/run-s/index.js \ No newline at end of file diff --git a/node_modules/.bin/semver b/node_modules/.bin/semver deleted file mode 120000 index 5aaadf4..0000000 --- a/node_modules/.bin/semver +++ /dev/null @@ -1 +0,0 @@ -../semver/bin/semver.js \ No newline at end of file diff --git a/node_modules/.bin/tsc b/node_modules/.bin/tsc deleted file mode 120000 index 0863208..0000000 --- a/node_modules/.bin/tsc +++ /dev/null @@ -1 +0,0 @@ -../typescript/bin/tsc \ No newline at end of file diff --git a/node_modules/.bin/tsserver b/node_modules/.bin/tsserver deleted file mode 120000 index f8f8f1a..0000000 --- a/node_modules/.bin/tsserver +++ /dev/null @@ -1 +0,0 @@ -../typescript/bin/tsserver \ No newline at end of file diff --git a/node_modules/.bin/which b/node_modules/.bin/which deleted file mode 120000 index f62471c..0000000 --- a/node_modules/.bin/which +++ /dev/null @@ -1 +0,0 @@ -../which/bin/which \ No newline at end of file diff --git a/node_modules/.bin/window-size b/node_modules/.bin/window-size deleted file mode 120000 index e84c8ec..0000000 --- a/node_modules/.bin/window-size +++ /dev/null @@ -1 +0,0 @@ -../window-size/cli.js \ No newline at end of file diff --git a/node_modules/.bin/yamllint b/node_modules/.bin/yamllint deleted file mode 120000 index 9cc8ed0..0000000 --- a/node_modules/.bin/yamllint +++ /dev/null @@ -1 +0,0 @@ -../yaml-lint/cli.js \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 49b64c9..5a06dc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "install-ssh-key", - "version": "1.6.3", + "version": "1.6.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 8f20ff9..4c46693 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "install-ssh-key", - "version": "1.6.3", + "version": "1.6.4", "private": true, "description": "Install SSH key in .ssh", "main": "lib/main.js",