Merge branch 'develop' into feature/private-key

CHANGELOG.md

@@ -9,31 +9,37 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * rename `private-key` to `key`
 
+## [1.6.1] - 2020-01-19
+
+### 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
 
@@ -44,18 +50,19 @@ 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.
 
-[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

README.md

@@ -1,4 +1,4 @@
-# Install SSH key
+# Install SSH Key
 
 [![Build][image-build]][link-build]
 [![Windows][image-verify-windows]][link-verify-windows]
@@ -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.
 

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"

package-lock.json

@@ -1,6 +1,6 @@
 {
-  "name": "ssh-key-action",
+  "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",
+      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+      "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",
+      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==",
       "dev": true
     },
     "fast-diff": {

package.json

@@ -1,11 +1,11 @@
 {
-  "name": "ssh-key-action",
+  "name": "install-ssh-key",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "private": true,
-  "description": "Install SSH key to .ssh",
+  "description": "Install SSH key in .ssh",
   "main": "lib/main.js",
   "engines": {
-    "node": ">= 8.0.0",
+    "node": ">=8.0.0",
     "npm": ">=5.7.0"
   },
   "scripts": {
@@ -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": {

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}"

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