From 01556dafe41e76992ba34ab133daa0eac5714069 Mon Sep 17 00:00:00 2001 From: shimataro Date: Sat, 6 Jun 2020 11:05:25 +0900 Subject: [PATCH] add Ubuntu 20.04 (#135) * add Ubuntu 20.04 * macOS -> macOS Catalina * rename CI files * Windows -> Windows Server 2019 * update README * update CHANGELOG --- ...-on-macos.yml => verify-on-macos-1015.yml} | 6 +-- ...untu1604.yml => verify-on-ubuntu-1604.yml} | 0 ...n-ubuntu.yml => verify-on-ubuntu-1804.yml} | 6 +-- .github/workflows/verify-on-ubuntu-2004.yml | 45 +++++++++++++++++++ ....yml => verify-on-windows-server-2019.yml} | 6 +-- CHANGELOG.md | 4 ++ README.md | 30 +++++++------ 7 files changed, 75 insertions(+), 22 deletions(-) rename .github/workflows/{verify-on-macos.yml => verify-on-macos-1015.yml} (94%) rename .github/workflows/{verify-on-ubuntu1604.yml => verify-on-ubuntu-1604.yml} (100%) rename .github/workflows/{verify-on-ubuntu.yml => verify-on-ubuntu-1804.yml} (94%) create mode 100644 .github/workflows/verify-on-ubuntu-2004.yml rename .github/workflows/{verify-on-windows.yml => verify-on-windows-server-2019.yml} (93%) diff --git a/.github/workflows/verify-on-macos.yml b/.github/workflows/verify-on-macos-1015.yml similarity index 94% rename from .github/workflows/verify-on-macos.yml rename to .github/workflows/verify-on-macos-1015.yml index 274b1e1..eb17706 100644 --- a/.github/workflows/verify-on-macos.yml +++ b/.github/workflows/verify-on-macos-1015.yml @@ -1,6 +1,6 @@ # https://help.github.com/en/articles/workflow-syntax-for-github-actions -name: macOS +name: macOS Catalina on: - push @@ -9,7 +9,7 @@ on: jobs: ssh: name: Connect to github.com - runs-on: macos-latest + runs-on: macos-10.15 steps: - name: Checkout source codes uses: actions/checkout@v2 @@ -24,7 +24,7 @@ jobs: run: git clone git@github.com:shimataro/ssh-key-action.git tmp ssh-with-name: name: Connect to github.com with name and config - runs-on: macos-latest + runs-on: macos-10.15 steps: - name: Checkout source codes uses: actions/checkout@v2 diff --git a/.github/workflows/verify-on-ubuntu1604.yml b/.github/workflows/verify-on-ubuntu-1604.yml similarity index 100% rename from .github/workflows/verify-on-ubuntu1604.yml rename to .github/workflows/verify-on-ubuntu-1604.yml diff --git a/.github/workflows/verify-on-ubuntu.yml b/.github/workflows/verify-on-ubuntu-1804.yml similarity index 94% rename from .github/workflows/verify-on-ubuntu.yml rename to .github/workflows/verify-on-ubuntu-1804.yml index 2400e1e..3dc2711 100644 --- a/.github/workflows/verify-on-ubuntu.yml +++ b/.github/workflows/verify-on-ubuntu-1804.yml @@ -1,6 +1,6 @@ # https://help.github.com/en/articles/workflow-syntax-for-github-actions -name: Ubuntu +name: Ubuntu 18.04 on: - push @@ -9,7 +9,7 @@ on: jobs: ssh: name: Connect to github.com - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - name: Checkout source codes uses: actions/checkout@v2 @@ -24,7 +24,7 @@ jobs: run: git clone git@github.com:shimataro/ssh-key-action.git tmp ssh-with-name: name: Connect to github.com with name and config - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - name: Checkout source codes uses: actions/checkout@v2 diff --git a/.github/workflows/verify-on-ubuntu-2004.yml b/.github/workflows/verify-on-ubuntu-2004.yml new file mode 100644 index 0000000..5ae7307 --- /dev/null +++ b/.github/workflows/verify-on-ubuntu-2004.yml @@ -0,0 +1,45 @@ +# https://help.github.com/en/articles/workflow-syntax-for-github-actions + +name: Ubuntu 20.04 + +on: +- push +- pull_request + +jobs: + ssh: + name: Connect to github.com + runs-on: ubuntu-20.04 + steps: + - name: Checkout source codes + uses: actions/checkout@v2 + - name: Install SSH key + uses: ./. + with: + key: ${{ secrets.SSH_KEY }} + known_hosts: ${{ secrets.KNOWN_HOSTS }} + - name: print created files + run: ls -l ~/.ssh + - name: git clone through SSH + run: git clone git@github.com:shimataro/ssh-key-action.git tmp + ssh-with-name: + name: Connect to github.com with name and config + runs-on: ubuntu-20.04 + steps: + - name: Checkout source codes + uses: actions/checkout@v2 + - name: Install SSH key + uses: ./. + with: + key: ${{ secrets.SSH_KEY }} + known_hosts: ${{ secrets.KNOWN_HOSTS }} + name: ssh_key_name # optional + config: | # optional + Host github + Hostname github.com + User git + IdentityFile ~/.ssh/ssh_key_name + - name: print created files + run: ls -l ~/.ssh + - name: git clone through SSH + run: git clone github:shimataro/ssh-key-action.git tmp diff --git a/.github/workflows/verify-on-windows.yml b/.github/workflows/verify-on-windows-server-2019.yml similarity index 93% rename from .github/workflows/verify-on-windows.yml rename to .github/workflows/verify-on-windows-server-2019.yml index bfd62d5..8159105 100644 --- a/.github/workflows/verify-on-windows.yml +++ b/.github/workflows/verify-on-windows-server-2019.yml @@ -1,6 +1,6 @@ # https://help.github.com/en/articles/workflow-syntax-for-github-actions -name: Windows +name: Windows Server 2019 on: - push @@ -9,7 +9,7 @@ on: jobs: ssh: name: Connect to github.com - runs-on: windows-latest + runs-on: windows-2019 steps: - name: Checkout source codes uses: actions/checkout@v2 @@ -24,7 +24,7 @@ jobs: run: git clone git@github.com:shimataro/ssh-key-action.git tmp ssh-with-name: name: Connect to github.com with name and config - runs-on: windows-latest + runs-on: windows-2019 steps: - name: Checkout source codes uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c7e4d0..ce80f2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +### Added + +* Ubuntu 20.04 + ### Changed * Add short note on how to convert OPENSSH to PEM format by [@shadow1runner](https://github.com/shadow1runner) diff --git a/README.md b/README.md index cb5f6a8..c43ab62 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,11 @@ # Install SSH Key [![Build][image-build]][link-build] -[![Windows][image-verify-windows]][link-verify-windows] -[![macOS][image-verify-macos]][link-verify-macos] -[![Ubuntu][image-verify-ubuntu]][link-verify-ubuntu] -[![Ubuntu 16.04][image-verify-ubuntu1604]][link-verify-ubuntu1604] +[![Windows Server 2019][image-verify-windows-2019]][link-verify-windows-2019] +[![macOS Catalina][image-verify-macos-1015]][link-verify-macos-1015] +[![Ubuntu 20.04][image-verify-ubuntu-2004]][link-verify-ubuntu-2004] +[![Ubuntu 18.04][image-verify-ubuntu-1804]][link-verify-ubuntu-1804] +[![Ubuntu 16.04][image-verify-ubuntu-1604]][link-verify-ubuntu-1604] [![Release][image-release]][link-release] [![License][image-license]][link-license] [![Stars][image-stars]][link-stars] @@ -13,7 +14,8 @@ This action installs SSH key in `~/.ssh`. Useful for SCP, SFTP, and `rsync` over SSH in deployment script. -**Works on all [virtual environment](https://help.github.com/en/actions/automating-your-workflow-with-github-actions/virtual-environments-for-github-hosted-runners#supported-runners-and-hardware-resources) -- Windows, macOS, Ubuntu and Ubuntu 16.04.** +**Works on all [virtual environments](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 2019, macOS Catalina, Ubuntu 20.04, Ubuntu 18.04, and Ubuntu 16.04.** ## Usage @@ -132,14 +134,16 @@ See [CHANGELOG.md](CHANGELOG.md). [image-build]: https://github.com/shimataro/ssh-key-action/workflows/Build/badge.svg?event=push&branch=v2 [link-build]: https://github.com/shimataro/ssh-key-action/actions?query=workflow%3ABuild -[image-verify-windows]: https://github.com/shimataro/ssh-key-action/workflows/Windows/badge.svg?event=push&branch=v2 -[link-verify-windows]: https://github.com/shimataro/ssh-key-action/actions?query=workflow%3AWindows -[image-verify-macos]: https://github.com/shimataro/ssh-key-action/workflows/macOS/badge.svg?event=push&branch=v2 -[link-verify-macos]: https://github.com/shimataro/ssh-key-action/actions?query=workflow%3AmacOS -[image-verify-ubuntu]: https://github.com/shimataro/ssh-key-action/workflows/Ubuntu/badge.svg?event=push&branch=v2 -[link-verify-ubuntu]: https://github.com/shimataro/ssh-key-action/actions?query=workflow%3AUbuntu -[image-verify-ubuntu1604]: https://github.com/shimataro/ssh-key-action/workflows/Ubuntu%2016.04/badge.svg?event=push&branch=v2 -[link-verify-ubuntu1604]: https://github.com/shimataro/ssh-key-action/actions?query=workflow%3A%22Ubuntu+16.04%22 +[image-verify-windows-2019]: https://github.com/shimataro/ssh-key-action/workflows/Windows%20Server%202019/badge.svg?event=push&branch=v2 +[link-verify-windows-2019]: https://github.com/shimataro/ssh-key-action/actions?query=workflow%3A%22Windows+Server+2019%22 +[image-verify-macos-1015]: https://github.com/shimataro/ssh-key-action/workflows/macOS%20Catalina/badge.svg?event=push&branch=v2 +[link-verify-macos-1015]: https://github.com/shimataro/ssh-key-action/actions?query=workflow%3A%22macOS+Catalina%22 +[image-verify-ubuntu-2004]: https://github.com/shimataro/ssh-key-action/workflows/Ubuntu%2020.04/badge.svg?event=push&branch=v2 +[link-verify-ubuntu-2004]: https://github.com/shimataro/ssh-key-action/actions?query=workflow%3A%22Ubuntu+20.04%22 +[image-verify-ubuntu-1804]: https://github.com/shimataro/ssh-key-action/workflows/Ubuntu%2018.04/badge.svg?event=push&branch=v2 +[link-verify-ubuntu-1804]: https://github.com/shimataro/ssh-key-action/actions?query=workflow%3A%22Ubuntu+18.04%22 +[image-verify-ubuntu-1604]: https://github.com/shimataro/ssh-key-action/workflows/Ubuntu%2016.04/badge.svg?event=push&branch=v2 +[link-verify-ubuntu-1604]: https://github.com/shimataro/ssh-key-action/actions?query=workflow%3A%22Ubuntu+16.04%22 [image-release]: https://img.shields.io/github/release/shimataro/ssh-key-action.svg [link-release]: https://github.com/shimataro/ssh-key-action/releases [image-license]: https://img.shields.io/github/license/shimataro/ssh-key-action.svg