Merge pull request #258 from shimataro/develop

version 2.6.0
shimataro · Oct 11, 2023 · d05e1bd · d05e1bd
2 parents 685d0f2 + a9c5970
commit d05e1bd
Show file tree

Hide file tree

Showing 24 changed files with 3,725 additions and 5,015 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,14 +12,12 @@ jobs:
     strategy:
       matrix:
         os:
-        - Windows-2019
-        - Windows-2022
-        - macOS-10.15
-        - macOS-11
-        - macOS-12
-        - Ubuntu-18.04
-        - Ubuntu-20.04
-        - Ubuntu-22.04
+        - windows-2019
+        - windows-2022
+        - macos-11
+        - macos-12
+        - ubuntu-20.04
+        - ubuntu-22.04
         nodejs:
         - 16
       fail-fast: false
@@ -36,5 +34,7 @@ jobs:
       run: npm ci
     - name: Build
       run: npm run build
+    - name: Exit if differ (forgot to commit dist dir?)
+      run: git diff --exit-code --quiet
     - name: Verify
       run: npm run verify
diff --git a/.github/workflows/reusable-verify.yml b/.github/workflows/reusable-verify.yml
@@ -63,7 +63,9 @@ jobs:
       with:
         key: ${{ secrets.SSH_KEY_PEM }}
         known_hosts: |
-          bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
+          bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQeJzhupRu0u0cdegZIa8e86EG2qOCsIsD1Xw0xSeiPDlCr7kq97NLmMbpKTX6Esc30NuoqEEHCuc7yWtwp8dI76EEEB1VqY9QJq6vk+aySyboD5QF61I/1WeTwu+deCbgKMGbUijeXhtfbxSxm6JwGrXrhBdofTsbKRUsrN1WoNgUa8uqN1Vx6WAJw1JHPhglEGGHea6QICwJOAr/6mrui/oB7pkaWKHj3z7d1IC4KWLtY47elvjbaTlkN04Kc/5LFEirorGYVbt15kAUlqGM65pk6ZBxtaO3+30LVlORZkxOh+LKL/BvbZ/iRNhItLqNyieoQj/uh/7Iv4uyH/cV/0b4WDSd3DptigWq84lJubb9t/DnZlrJazxyDCulTmKdOR7vs9gMTo+uoIrPSb8ScTtvw65+odKAlBj59dhnVp9zd7QUojOpXlL62Aw56U4oO+FALuevvMjiWeavKhJqlR7i5n9srYcrNV7ttmDw7kf/97P5zauIhxcjX+xHv4M=
+          bitbucket.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPIQmuzMBuKdWeF4+a2sjSSpBK0iqitSQ+5BM9KhpexuGt20JpTVM7u5BDZngncgrqDMbWdxMWWOGtZ9UgbqgZE=
+          bitbucket.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIazEu89wgQZ4bqs3d63QSMzYVa0MuJ2e2gKTKqu+UUO
     - name: git clone through SSH
       run: git clone [email protected]:shimataro999/ssh-test.git tmp
 
@@ -100,7 +102,9 @@ jobs:
       with:
         key: ${{ secrets.SSH_KEY_PKCS8 }}
         known_hosts: |
-          bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
+          bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQeJzhupRu0u0cdegZIa8e86EG2qOCsIsD1Xw0xSeiPDlCr7kq97NLmMbpKTX6Esc30NuoqEEHCuc7yWtwp8dI76EEEB1VqY9QJq6vk+aySyboD5QF61I/1WeTwu+deCbgKMGbUijeXhtfbxSxm6JwGrXrhBdofTsbKRUsrN1WoNgUa8uqN1Vx6WAJw1JHPhglEGGHea6QICwJOAr/6mrui/oB7pkaWKHj3z7d1IC4KWLtY47elvjbaTlkN04Kc/5LFEirorGYVbt15kAUlqGM65pk6ZBxtaO3+30LVlORZkxOh+LKL/BvbZ/iRNhItLqNyieoQj/uh/7Iv4uyH/cV/0b4WDSd3DptigWq84lJubb9t/DnZlrJazxyDCulTmKdOR7vs9gMTo+uoIrPSb8ScTtvw65+odKAlBj59dhnVp9zd7QUojOpXlL62Aw56U4oO+FALuevvMjiWeavKhJqlR7i5n9srYcrNV7ttmDw7kf/97P5zauIhxcjX+xHv4M=
+          bitbucket.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPIQmuzMBuKdWeF4+a2sjSSpBK0iqitSQ+5BM9KhpexuGt20JpTVM7u5BDZngncgrqDMbWdxMWWOGtZ9UgbqgZE=
+          bitbucket.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIazEu89wgQZ4bqs3d63QSMzYVa0MuJ2e2gKTKqu+UUO
     - name: git clone through SSH
       run: git clone [email protected]:shimataro999/ssh-test.git tmp
 
@@ -137,7 +141,9 @@ jobs:
       with:
         key: ${{ secrets.SSH_KEY_RFC4716 }}
         known_hosts: |
-          bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
+          bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQeJzhupRu0u0cdegZIa8e86EG2qOCsIsD1Xw0xSeiPDlCr7kq97NLmMbpKTX6Esc30NuoqEEHCuc7yWtwp8dI76EEEB1VqY9QJq6vk+aySyboD5QF61I/1WeTwu+deCbgKMGbUijeXhtfbxSxm6JwGrXrhBdofTsbKRUsrN1WoNgUa8uqN1Vx6WAJw1JHPhglEGGHea6QICwJOAr/6mrui/oB7pkaWKHj3z7d1IC4KWLtY47elvjbaTlkN04Kc/5LFEirorGYVbt15kAUlqGM65pk6ZBxtaO3+30LVlORZkxOh+LKL/BvbZ/iRNhItLqNyieoQj/uh/7Iv4uyH/cV/0b4WDSd3DptigWq84lJubb9t/DnZlrJazxyDCulTmKdOR7vs9gMTo+uoIrPSb8ScTtvw65+odKAlBj59dhnVp9zd7QUojOpXlL62Aw56U4oO+FALuevvMjiWeavKhJqlR7i5n9srYcrNV7ttmDw7kf/97P5zauIhxcjX+xHv4M=
+          bitbucket.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPIQmuzMBuKdWeF4+a2sjSSpBK0iqitSQ+5BM9KhpexuGt20JpTVM7u5BDZngncgrqDMbWdxMWWOGtZ9UgbqgZE=
+          bitbucket.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIazEu89wgQZ4bqs3d63QSMzYVa0MuJ2e2gKTKqu+UUO
     - name: git clone through SSH
       run: git clone [email protected]:shimataro999/ssh-test.git tmp
 
@@ -156,7 +162,7 @@ jobs:
       with:
         key: "dummy" # replaced
         known_hosts: unnecessary
-    - name: Install SSH key (replace)
+    - name: Install SSH key (replaces existing key)
       uses: ./.
       with:
         key: ${{ secrets.SSH_KEY_PEM }}
@@ -175,7 +181,7 @@ jobs:
       if: ${{ inputs.package_installation_command != '' }}
     - name: Checkout source codes
       uses: actions/checkout@v3
-    - name: Install SSH key (replace)
+    - name: Install SSH key
       uses: ./.
       with:
         key: ${{ secrets.SSH_KEY_PEM }}
@@ -194,12 +200,12 @@ jobs:
       if: ${{ inputs.package_installation_command != '' }}
     - name: Checkout source codes
       uses: actions/checkout@v3
-    - name: Install SSH key (dummy)
+    - name: Install SSH key
       uses: ./.
       with:
         key: ${{ secrets.SSH_KEY_PEM }}
         known_hosts: unnecessary
-    - name: Install SSH key (replace)
+    - name: Install SSH key (does nothing)
       uses: ./.
       with:
         key: "dummy" # ignored
@@ -218,7 +224,7 @@ jobs:
       if: ${{ inputs.package_installation_command != '' }}
     - name: Checkout source codes
       uses: actions/checkout@v3
-    - name: Install SSH key (replace)
+    - name: Install SSH key
       uses: ./.
       with:
         key: ${{ secrets.SSH_KEY_PEM }}
@@ -237,15 +243,15 @@ jobs:
       if: ${{ inputs.package_installation_command != '' }}
     - name: Checkout source codes
       uses: actions/checkout@v3
-    - name: Install SSH key (dummy)
+    - name: Install SSH key
       uses: ./.
       with:
         key: ${{ secrets.SSH_KEY_PEM }}
         known_hosts: unnecessary
-    - name: Install SSH key (replace)
+    - name: Install SSH key (fails)
       uses: ./.
       with:
-        key: "dummy" # ignored
+        key: "dummy" # fails
         known_hosts: unnecessary
         if_key_exists: fail
       continue-on-error: true
@@ -262,7 +268,7 @@ jobs:
       if: ${{ inputs.package_installation_command != '' }}
     - name: Checkout source codes
       uses: actions/checkout@v3
-    - name: Install SSH key (replace)
+    - name: Install SSH key
       uses: ./.
       with:
         key: ${{ secrets.SSH_KEY_PEM }}

diff --git a/.github/workflows/verify-on-container-alpine.yml b/.github/workflows/verify-on-container-alpine.yml
@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - ubuntu-18.04
         - ubuntu-20.04
         - ubuntu-22.04
         docker_image:

diff --git a/.github/workflows/verify-on-container-centos.yml b/.github/workflows/verify-on-container-centos.yml
@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - ubuntu-18.04
         - ubuntu-20.04
         - ubuntu-22.04
         docker_image:

diff --git a/.github/workflows/verify-on-container-ubuntu.yml b/.github/workflows/verify-on-container-ubuntu.yml
@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - ubuntu-18.04
         - ubuntu-20.04
         - ubuntu-22.04
         docker_image:

diff --git a/.github/workflows/verify-on-macos.yml b/.github/workflows/verify-on-macos.yml
@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - macos-10.15
         - macos-11
         - macos-12
     uses: "./.github/workflows/reusable-verify.yml"

diff --git a/.github/workflows/verify-on-ubuntu.yml b/.github/workflows/verify-on-ubuntu.yml
@@ -11,7 +11,6 @@ jobs:
       fail-fast: false
       matrix:
         os:
-        - ubuntu-18.04
         - ubuntu-20.04
         - ubuntu-22.04
     uses: "./.github/workflows/reusable-verify.yml"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [2.6.0] - 2023-10-11
+
+### Others
+
+* back up and restore files when exist (thanks [@bambeusz](https://github.com/bambeusz))
+* remove `macos-10.15` and `ubuntu-18.04` virtual environment
+
 ## [2.5.1] - 2023-03-25
 
 ### Hotfix
@@ -186,7 +193,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/v2.5.1...HEAD
+[Unreleased]: https://github.com/shimataro/ssh-key-action/compare/v2.6.0...HEAD
+[2.6.0]: https://github.com/shimataro/ssh-key-action/compare/v2.5.1...v2.6.0
 [2.5.1]: https://github.com/shimataro/ssh-key-action/compare/v2.5.0...v2.5.1
 [2.5.0]: https://github.com/shimataro/ssh-key-action/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/shimataro/ssh-key-action/compare/v2.3.1...v2.4.0

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Useful for SCP, SFTP, and `rsync` over SSH in deployment script.
 
 tested on:
 
-* [all available virtual machines](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners#supported-runners-and-hardware-resources) (Windows Server 2022/2019, macOS Monterey/Big Sur/Catalina, and Ubuntu 22.04/20.04/18.04)
+* [all available virtual machines](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners#supported-runners-and-hardware-resources) (Windows Server 2022/2019, macOS Monterey/Big Sur, and Ubuntu 22.04/20.04)
 * [Docker container (Ubuntu)](https://hub.docker.com/_/ubuntu) / requires `openssh-client` package; `apt install -y openssh-client`
 * [Docker container (CentOS)](https://quay.io/repository/centos/centos) / requires `openssh-clients` package; `yum install -y openssh-clients`
 * [Docker container (Alpine Linux)](https://hub.docker.com/_/alpine) / requires `openssh-client` package; `apk add openssh-client`

diff --git a/action.yml b/action.yml
@@ -27,5 +27,5 @@ inputs:
     default: "fail"
 runs:
   using: "node16"
-  main: "lib/index.js"
-  post: "lib/index.js"
+  main: "./dist/main.js"
+  post: "./dist/post.js"