From 9289becf6465caeec0da745ecfa54cd9577324de Mon Sep 17 00:00:00 2001 From: shimataro Date: Sat, 18 Jan 2020 20:20:37 +0900 Subject: [PATCH 1/8] Feature/name (#74) * * "Install SSH key" -> "Install SSH Key" * * update package.json --- README.md | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 82ff649..0b76300 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Install SSH key +# Install SSH Key [![Build][image-build]][link-build] [![Windows][image-verify-windows]][link-verify-windows] diff --git a/package-lock.json b/package-lock.json index f9138cb..365a6a3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "ssh-key-action", + "name": "install-ssh-key", "version": "1.6.0", "lockfileVersion": 1, "requires": true, diff --git a/package.json b/package.json index 801303a..a621f05 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "ssh-key-action", + "name": "install-ssh-key", "version": "1.6.0", "private": true, "description": "Install SSH key to .ssh", From 9a9a8bc7affac1806c2f3cbf9839e7b9641a61f3 Mon Sep 17 00:00:00 2001 From: shimataro Date: Sat, 18 Jan 2020 20:30:41 +0900 Subject: [PATCH 2/8] * use "install in", not "install to" (#75) --- action.yml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/action.yml b/action.yml index 3f5fdf5..734fd12 100644 --- a/action.yml +++ b/action.yml @@ -1,6 +1,6 @@ # https://help.github.com/en/articles/metadata-syntax-for-github-actions name: "Install SSH Key" -description: "Install SSH key to ~/.ssh" +description: "Install SSH key in ~/.ssh" author: "shimataro" branding: icon: "terminal" diff --git a/package.json b/package.json index a621f05..a333e2a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "install-ssh-key", "version": "1.6.0", "private": true, - "description": "Install SSH key to .ssh", + "description": "Install SSH key in .ssh", "main": "lib/main.js", "engines": { "node": ">= 8.0.0", From d000dbd58412eece05e78402c8c6964897a3860f Mon Sep 17 00:00:00 2001 From: shimataro Date: Sat, 18 Jan 2020 21:25:09 +0900 Subject: [PATCH 3/8] * "install into" -> "install in" (#76) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b76300..e745912 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ [![License][image-license]][link-license] [![Stars][image-stars]][link-stars] -This action installs SSH key into `~/.ssh`. +This action installs SSH key in `~/.ssh`. Useful for SCP, SFTP, and `rsync` over SSH in deployment script. From 6f43580cbff49cca505b443f14c2cf16f140443b Mon Sep 17 00:00:00 2001 From: shimataro Date: Sun, 19 Jan 2020 11:23:23 +0900 Subject: [PATCH 4/8] Feature/dev branch (#77) * * renamed "development" to "develop" * * renamed "development" to "develop" --- scripts/create-release-branch.sh | 2 +- scripts/update-dependencies.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/create-release-branch.sh b/scripts/create-release-branch.sh index 6304511..210c5fc 100755 --- a/scripts/create-release-branch.sh +++ b/scripts/create-release-branch.sh @@ -3,7 +3,7 @@ # - git; I believe it's already installed. # - sed; GNU sed is preferred. POSIX sed may not work. -BASE_BRANCH="development" +BASE_BRANCH="develop" PACKAGE_NAME="ssh-key-action" URL_PRODUCT="https://github.com/shimataro/${PACKAGE_NAME}" diff --git a/scripts/update-dependencies.sh b/scripts/update-dependencies.sh index a67fc3e..b859641 100755 --- a/scripts/update-dependencies.sh +++ b/scripts/update-dependencies.sh @@ -7,7 +7,7 @@ COLOR_SUCCESS="\e[1;32m" COLOR_RESET="\e[m" # create branch -git checkout development || exit 1 +git checkout develop || exit 1 git checkout -b ${BRANCH} || exit 1 # check updates From 08e7847a0b28af8c47d8f147bbd17b9021afeb36 Mon Sep 17 00:00:00 2001 From: shimataro Date: Sun, 19 Jan 2020 11:51:18 +0900 Subject: [PATCH 5/8] Bugfix/yaml lint (#78) * * lint YAML files in subdirectories * * refactor yaml-lint cli --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a333e2a..be85966 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "lint": "run-p lint:*", "lint:ts": "eslint ./src --ext .ts", "lint:md": "markdownlint . --ignore node_modules --ignore examples", - "lint:yaml": "yamllint .*.yml *.yml --ignore=node_modules/**/*.yml --ignore=node_modules/**/*.yaml", + "lint:yaml": "yamllint **/{,.}*.{yml,yaml} --ignore=node_modules/**", "verify": "run-p lint" }, "repository": { From 9498a2547e99623616969ad84a7f5062c5f614f0 Mon Sep 17 00:00:00 2001 From: shimataro Date: Sun, 19 Jan 2020 11:57:29 +0900 Subject: [PATCH 6/8] * remove spaces in node version (#79) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index be85966..a5f6efe 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "description": "Install SSH key in .ssh", "main": "lib/main.js", "engines": { - "node": ">= 8.0.0", + "node": ">=8.0.0", "npm": ">=5.7.0" }, "scripts": { From 277f0942be38b7542912057bbeda02b07caf602a Mon Sep 17 00:00:00 2001 From: shimataro Date: Sun, 19 Jan 2020 12:29:53 +0900 Subject: [PATCH 7/8] * update changelog (#81) --- CHANGELOG.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb33c62..562db40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,31 +7,35 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Fixed + +* Some bugfixes + ## [1.6.0] - 2020-01-18 ### Changed * `public-key` is no longer necessarily -## [1.5.0] +## [1.5.0] - 2019/12/30 ### Changed * Append contents of `config` and `known_hosts` when called multiple times. -## [1.4.0] +## [1.4.0] - 2019/12/22 ### Added * `config` option -## [1.3.0] +## [1.3.0] - 2019/09/29 ### Added * `known-hosts` option -## [1.2.0] +## [1.2.0] - 2019/09/22 ### Fixed @@ -42,14 +46,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. * Install only `dependencies` packages. -## [1.1.0] +## [1.1.0] - 2019/09/19 ### Others * Support Visual Studio Code officially. * Use GitHub Actions for build test. -## [1.0.0] +## [1.0.0] - 2019/09/18 * First release. From d5290d56084fd3e8d6671467caa7bb812cc6ea9f Mon Sep 17 00:00:00 2001 From: shimataro Date: Sun, 19 Jan 2020 23:38:28 +0900 Subject: [PATCH 8/8] version 1.6.1 (#82) --- CHANGELOG.md | 5 ++++- package-lock.json | 16 ++++++++-------- package.json | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 562db40..b21aea7 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.1] - 2020-01-19 + ### Fixed * Some bugfixes @@ -57,7 +59,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.0...HEAD +[Unreleased]: https://github.com/shimataro/ssh-key-action/compare/v1.6.1...HEAD +[1.6.1]: https://github.com/shimataro/ssh-key-action/compare/v1.6.0...v1.6.1 [1.6.0]: https://github.com/shimataro/ssh-key-action/compare/v1.5.0...v1.6.0 [1.5.0]: https://github.com/shimataro/ssh-key-action/compare/v1.4.0...v1.5.0 [1.4.0]: https://github.com/shimataro/ssh-key-action/compare/v1.3.0...v1.4.0 diff --git a/package-lock.json b/package-lock.json index 365a6a3..0eb6ad6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "install-ssh-key", - "version": "1.6.0", + "version": "1.6.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -177,12 +177,12 @@ } }, "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz", + "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", + "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" @@ -1163,9 +1163,9 @@ } }, "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==", "dev": true }, "fast-diff": { diff --git a/package.json b/package.json index a5f6efe..ab008c0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "install-ssh-key", - "version": "1.6.0", + "version": "1.6.1", "private": true, "description": "Install SSH key in .ssh", "main": "lib/main.js",