1

Signed-off-by: JackWhh <5264499+jack_whh@user.noreply.gitee.com>

.github/workflows/main.yml

@@ -1,21 +1,23 @@
-name: Continuous Deploy #action名称
-on: [push] #在推送的时候运行此action
+name: Continuous Deploy 
+on: [push] 
 
 jobs:
   deploy_job:
-    runs-on: ubuntu-latest  #运行环境
+    runs-on: ubuntu-latest  
     name: sftp
     steps:
       - name: Checkout    
         uses: actions/checkout@v2 
 
-      # 利用action把build好的文件上传到服务器/var/www/react-app路径下,需要确认此目录已在服务端创建
       - name: deploy file to server
         uses:  ./ # Uses an action in the root directory
         with:  
-          username: 'root'   #ssh user name
-          server: '${{ secrets.SERVER_IP }}'
+          username: 'wl'  
+          server: '${{ secrets.MAC_IP }}'
           ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
-          local_path: './action.yml'  # 对应我们项目build的文件夹路径
-          remote_path: '/var/www/react-app/'
-          # delete_remote_files: true
+          local_path: './*' 
+          remote_path: '/Users/wl/Downloads/t/a'
+          sftpArgs: '-o ConnectTimeout=5'
+          # sftp_only: true
+          password: ${{secrets.SSH_PASSWORD}}
+          # delete_remote_files: true

Dockerfile

@@ -1,6 +1,9 @@
 # Container image that runs your code
 FROM alpine:3.13
 
+RUN echo "http://mirrors.aliyun.com/alpine/v3.13/main" > /etc/apk/repositories
+RUN echo "http://mirrors.aliyun.com/alpine/v3.13/community" >> /etc/apk/repositories
+
 # Copies your code file from your action repository to the filesystem path `/` of the container
 COPY entrypoint.sh /entrypoint.sh
 

README.md

@@ -2,8 +2,7 @@
 
 > Use this action to deploy your files to server using `SSH Private Key`
 
-> 使用此`action`部署你的项目到服务器上,`仅支持密钥对连接`
-中文介绍链接：[使用Github Action 部署项目到云服务器](https://zhuanlan.zhihu.com/p/107545396)
+> 使用此`action`部署你的项目到服务器上，中文介绍链接：[使用Github Action 部署项目到云服务器](https://zhuanlan.zhihu.com/p/107545396)
 
 ## 1. Inputs 
 
@@ -12,101 +11,104 @@
 `username` | yes| | SSH username
 `server` | yes| | Remote host
 `port`| yes | 22 | Remote host port
-`ssh_private_key`| yes| | You can copy private key from your `ssh_private_key.pem` file, and save to`repo/settings/secrets`![](./resource/secret.jpg)
+`ssh_private_key`| no| | You can copy private key from your `ssh_private_key` file, and save to`repo/settings/secrets`![](./resource/secret.jpg)
 `local_path`| yes| ./* | `local_path` of you project, if you want put single file:use path like `./myfile`, if you want put directory: use path like `./static/*`, it will put all files under `static` directory. Default to `./*`(will put all files in your repo).
 `remote_path`|yes|| Remote path
 `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.
-`args` | 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. Please be `careful` set this to true
+<strike>args</strike> `sftpArgs` | no| | other args yor want to use of sftp, E.g.`-o ConnectTimeout=5`
+`delete_remote_files` | no | false | Set to `true` will delete remote path  folder and all files in it. 
+`password`| no| | SSH passsword，If a password is set, `ssh_private_key` is ignored. `for @v1.2.4 and greater`
 
-## Action Example	
+> **Warning**
+
+> Be careful when use `delete_remote_files`, This will delete remote path  folder and all files in it
+
+-----
+
+## 2.Action Examples
+
+```yaml
+on: [push]
+
+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]
+
+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: ${{ secrets.FTP_USERNAME }}
+            server: ${{ secrets.FTP_SERVER }}
+            port: ${{ secrets.FTP_PORT }}
+            local_path: './static/*'
+            remote_path: '/var/www/app'
+            sftp_only: true
+            password: ${{ secrets.FTP_PASSWORD }}
+```
+
+## 3. [Deploy React App Example](https://github.com/wlixcc/React-Deploy)
 
 
-	on: [push]
+```yaml
+on: [push]
 
-	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.3
-	        with:
-	          username: 'root'
-	          server: 'your server ip'
-	          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} 
-	          local_path: './static/*'
-	          remote_path: '/var/www/app'
-	          args: '-o ConnectTimeout=5'
+jobs:
+    deploy_job:
+    runs-on: ubuntu-latest
+    name: build&deploy
+    steps:
+        # To use this repository's private action, you must check out the repository
+        - name: Checkout
+        uses: actions/checkout@v2
 
-## 1. [Deploy React App Example](https://github.com/wlixcc/React-Deploy)
+        - name: Install Dependencies
+        run: yarn
+        - name: Build
+        run: yarn build
 
-> If you use nginx, all you need to do is upload the static files to the server after the project is built
+        - name: deploy file to server
+        uses: wlixcc/SFTP-Deploy-Action@v1.2.4
+        with:
+            username: 'root'
+            server: '${{ secrets.SERVER_IP }}'
+            ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
+            local_path: './build/*'
+            remote_path: '/var/www/react-app'
+            sftpArgs: '-o ConnectTimeout=5'
+```
 
-	on: [push]
-	
-	jobs:
-	  deploy_job:
-	    runs-on: ubuntu-latest
-	    name: build&deploy
-	    steps:
-	      # To use this repository's private action, you must check out the repository
-	      - name: Checkout
-	        uses: actions/checkout@v2
-	
-	      - name: Install Dependencies
-	        run: yarn
-	      - name: Build
-	        run: yarn build
-	
-	      - name: deploy file to server
-	        uses: wlixcc/SFTP-Deploy-Action@v1.2.3
-	        with:
-	          username: 'root'
-	          server: '${{ secrets.SERVER_IP }}'
-	          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
-	          local_path: './build/*'
-	          remote_path: '/var/www/react-app'
-	          args: '-o ConnectTimeout=5'
-	          
  ![](./resource/reactExample.jpg)
  
-## 2.Deploy Umi App Example (Ant Design Pro)
+ --------
 
-	name: continuous deployment
-	on: [push]
-	
-	jobs:
-	  deploy_job:
-	    runs-on: ubuntu-latest
-	    name: build&deploy
-	    steps:
-	      # To use this repository's private action, you must check out the repository
-	      - name: Checkout
-	        uses: actions/checkout@v2
-	     
-	      - name: Install umi
-	        run: yarn global add umi  
-	
-	      - name: Install Dependencies
-	        run: yarn
-	      - name: Build
-	        run: yarn build
-	
-	      - name: deploy file to server
-	        uses: wlixcc/SFTP-Deploy-Action@v1.2.3
-	        with:
-	          username: 'root'
-	          server: '${{ secrets.SERVER_IP }}'
-	          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
-	          local_path: './dist/*'
-	          remote_path: '/var/www/umiapp'
-	          args: '-o ConnectTimeout=5'
- ![](./resource/umiExample.jpg)
-	          
+## 4.Invalid format? You need keep format
 
- 
- 
- 	          
+If you use the Ed25519 algorithm to generate an SSH key pair `ssh-keygen -t ed25519 -C "your_email@example.com"`,
+you need to note that the last line of the private key is a blank line. You need to keep this line when adding Repository secrets, otherwise it may lead to an `invalid format` error.
+ ![](./resource/keepformat.jpg)
+
+ 

action.yml

@@ -26,14 +26,19 @@ inputs:
     description: 'connection via sftp protocol only'
     required: false
     default: false
-  args:
+  sftpArgs:
     description: 'sftp args'
     required: false
   delete_remote_files:
     description: 'This operation will delete all files in the remote path before upload. Please be careful set this to true'
     required: false
     default: false
-
+  password:
+    description: "SSH passsword，If a password is set, the secret key pair is ignored"
+    required: false
+  script:
+    description: "upload files after exec script"
+    required: false
 
 runs:
   using: 'docker'
@@ -46,8 +51,10 @@ runs:
     - ${{ inputs.local_path }}
     - ${{ inputs.remote_path }}
     - ${{ inputs.sftp_only }}
-    - ${{ inputs.args }}
+    - ${{ inputs.sftpArgs }}
     - ${{ inputs.delete_remote_files }}
+    - ${{ inputs.password }}
+    - ${{ inputs.script }}
 
 branding:
   icon: 'upload-cloud'  

entrypoint.sh

@@ -3,20 +3,48 @@
 #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
 
-
-TEMP_SSH_PRIVATE_KEY_FILE='../private_key.pem'
+TEMP_SSH_PRIVATE_KEY_FILE='../private_wdhcr.pem'
 TEMP_SFTP_FILE='../sftp'
 
+# make sure remote path is not empty
 if [ -z "$6" ]; then
    echo 'remote_path is empty'
    exit 1
 fi
 
+# use password
+if [ -z != ${10} ]; then
+	echo 'use sshpass'
+	apk add sshpass
+
+	if test $9 == "true";then
+  		echo 'Start delete remote files'
+		sshpass -p ${10} ssh -o StrictHostKeyChecking=no -p $3 $1@$2 rm -rf $6
+	fi
+	if test $7 = "true"; then
+  		echo "Connection via sftp protocol only, skip the command to create a directory"
+	else
+ 	 	echo 'Create directory if needed'
+ 	 	sshpass -p ${10} ssh -o StrictHostKeyChecking=no -p $3 $1@$2 mkdir -p $6
+	fi
+
+	echo 'SFTP Start'
+	# create a temporary file containing sftp commands
+	printf "%s" "put -r $5 $6" >$TEMP_SFTP_FILE
+	#-o StrictHostKeyChecking=no avoid Host key verification failed.
+	SSHPASS=${10} sshpass -e sftp -oBatchMode=no -b $TEMP_SFTP_FILE -P $3 $8 -o StrictHostKeyChecking=no $1@$2
+
+	echo 'Deploy Success'
+
+    exit 0
+fi
+
 # keep string format
 printf "%s" "$4" >$TEMP_SSH_PRIVATE_KEY_FILE
 # avoid Permissions too open
 chmod 600 $TEMP_SSH_PRIVATE_KEY_FILE
 
+# delete remote files if needed
 if test $9 == "true";then
   echo 'Start delete remote files'
   ssh -o StrictHostKeyChecking=no -p $3 -i $TEMP_SSH_PRIVATE_KEY_FILE $1@$2 rm -rf $6
@@ -25,7 +53,7 @@ fi
 if test $7 = "true"; then
   echo "Connection via sftp protocol only, skip the command to create a directory"
 else
-  echo 'SSH Start'
+  echo 'Create directory if needed'
   ssh -o StrictHostKeyChecking=no -p $3 -i $TEMP_SSH_PRIVATE_KEY_FILE $1@$2 mkdir -p $6
 fi
 
@@ -34,7 +62,12 @@ echo 'SFTP Start'
 printf "%s" "put -r $5 $6" >$TEMP_SFTP_FILE
 #-o StrictHostKeyChecking=no avoid Host key verification failed.
 sftp -b $TEMP_SFTP_FILE -P $3 $8 -o StrictHostKeyChecking=no -i $TEMP_SSH_PRIVATE_KEY_FILE $1@$2
-
+echo 'script--$11'
+echo $11
+echo ${11}
+echo "------"
+if [ -z != ${11} ]; then
+	ssh -o StrictHostKeyChecking=no -p $3 -i $TEMP_SSH_PRIVATE_KEY_FILE $1@$2 $11
+fi
 echo 'Deploy Success'
 exit 0
-