Merge pull request #34 from alfreddagenais/master

Ajustement for Readme file
This commit is contained in:
wl
2022-07-14 13:42:29 +08:00
committed by GitHub
2 changed files with 100 additions and 83 deletions

164
README.md
View File

@@ -18,102 +18,122 @@
`sftp_only`| no| | If your port only accepts the sftp protocol, set this option to `true`. However, please note that when this option is set to `true`, the remote folder will not be created automatically. `sftp_only`| no| | If your port only accepts the sftp protocol, set this option to `true`. However, please note that when this option is set to `true`, the remote folder will not be created automatically.
<strike>args</strike> `sftpArgs` | no| | other args yor want to use of sftp, E.g.`-o ConnectTimeout=5` <strike>args</strike> `sftpArgs` | no| | other args yor want to use of sftp, E.g.`-o ConnectTimeout=5`
`delete_remote_files` | no | false | Set `true` will delete all files in the remote path before upload. `delete_remote_files` | no | false | Set `true` will delete all files in the remote path before upload.
`passowrd`| no| | SSH passswordIf a password is set, `ssh_private_key` is ignored `password`| no| | SSH passswordIf a password is set, `ssh_private_key` is ignored. `for @v1.2.4 and greater`
> **Warning** > **Warning**
> Be careful when use `delete_remote_files`, This will remove all files in your remote path before uploading > Be careful when use `delete_remote_files`, This will remove all files in your remote path before uploading
## Action Examples
```yaml
on: [push]
## Action Example jobs:
deploy_job:
runs-on: ubuntu-latest
name: deploy
steps:
- name: Checkout
uses: actions/checkout@v2
- name: deploy file
uses: wlixcc/SFTP-Deploy-Action@v1.2.4
with:
username: 'root'
server: 'your server ip'
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
local_path: './static/*'
remote_path: '/var/www/app'
sftpArgs: '-o ConnectTimeout=5'
```
```yaml
on: [push]
on: [push] jobs:
deploy_job:
jobs: runs-on: ubuntu-latest
deploy_job: name: deploy
runs-on: ubuntu-latest steps:
name: deploy - name: Checkout
steps: uses: actions/checkout@v2
- name: Checkout - name: Deploy file
uses: actions/checkout@v2 uses: wlixcc/SFTP-Deploy-Action@v1.2.4
- name: deploy file with:
uses: wlixcc/SFTP-Deploy-Action@v1.2.3 username: ${{ secrets.FTP_USERNAME }}
with: server: ${{ secrets.FTP_SERVER }}
username: 'root' port: ${{ secrets.FTP_PORT }}
server: 'your server ip' local_path: './static/*'
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} remote_path: '/var/www/app'
local_path: './static/*' sftp_only: true
remote_path: '/var/www/app' password: ${{ secrets.FTP_PASSWORD }}
sftpArgs: '-o ConnectTimeout=5' ```
## 1. [Deploy React App Example](https://github.com/wlixcc/React-Deploy) ## 1. [Deploy React App Example](https://github.com/wlixcc/React-Deploy)
> If you use nginx, all you need to do is upload the static files to the server after the project is built > If you use nginx, all you need to do is upload the static files to the server after the project is built
on: [push] ```yaml
on: [push]
jobs: jobs:
deploy_job: deploy_job:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: build&deploy name: build&deploy
steps: steps:
# To use this repository's private action, you must check out the repository # To use this repository's private action, you must check out the repository
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install Dependencies - name: Install Dependencies
run: yarn run: yarn
- name: Build - name: Build
run: yarn build run: yarn build
- name: deploy file to server - name: deploy file to server
uses: wlixcc/SFTP-Deploy-Action@v1.2.4 uses: wlixcc/SFTP-Deploy-Action@v1.2.4
with: with:
username: 'root' username: 'root'
server: '${{ secrets.SERVER_IP }}' server: '${{ secrets.SERVER_IP }}'
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
local_path: './build/*' local_path: './build/*'
remote_path: '/var/www/react-app' remote_path: '/var/www/react-app'
sftpArgs: '-o ConnectTimeout=5' sftpArgs: '-o ConnectTimeout=5'
```
![](./resource/reactExample.jpg) ![](./resource/reactExample.jpg)
## 2.Deploy Umi App Example (Ant Design Pro) ## 2.Deploy Umi App Example (Ant Design Pro)
name: continuous deployment ```yaml
on: [push] name: continuous deployment
on: [push]
jobs: jobs:
deploy_job: deploy_job:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: build&deploy name: build&deploy
steps: steps:
# To use this repository's private action, you must check out the repository # To use this repository's private action, you must check out the repository
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install umi - name: Install umi
run: yarn global add umi run: yarn global add umi
- name: Install Dependencies - name: Install Dependencies
run: yarn run: yarn
- name: Build - name: Build
run: yarn build run: yarn build
- name: deploy file to server - name: deploy file to server
uses: wlixcc/SFTP-Deploy-Action@v1.2.4 uses: wlixcc/SFTP-Deploy-Action@v1.2.4
with: with:
username: 'root' username: 'root'
server: '${{ secrets.SERVER_IP }}' server: '${{ secrets.SERVER_IP }}'
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
local_path: './dist/*' local_path: './dist/*'
remote_path: '/var/www/umiapp' remote_path: '/var/www/umiapp'
sftpArgs: '-o ConnectTimeout=5' sftpArgs: '-o ConnectTimeout=5'
```
![](./resource/umiExample.jpg) ![](./resource/umiExample.jpg)

View File

@@ -3,7 +3,6 @@
#set -e at the top of your script will make the script exit with an error whenever an error occurs (and is not explicitly handled) #set -e at the top of your script will make the script exit with an error whenever an error occurs (and is not explicitly handled)
set -eu set -eu
TEMP_SSH_PRIVATE_KEY_FILE='../private_key.pem' TEMP_SSH_PRIVATE_KEY_FILE='../private_key.pem'
TEMP_SFTP_FILE='../sftp' TEMP_SFTP_FILE='../sftp'
@@ -13,7 +12,6 @@ if [ -z "$6" ]; then
exit 1 exit 1
fi fi
# use password # use password
if [ -z != ${10} ]; then if [ -z != ${10} ]; then
echo 'use sshpass' echo 'use sshpass'
@@ -67,4 +65,3 @@ sftp -b $TEMP_SFTP_FILE -P $3 $8 -o StrictHostKeyChecking=no -i $TEMP_SSH_PRIVAT
echo 'Deploy Success' echo 'Deploy Success'
exit 0 exit 0