chore: support -arch=

chore: upgrade package
chore(GitHub): support actions parameter.
2026-06-16 14:49:20 +08:00 · 2019-09-28 14:14:15 +08:00 · 2019-09-28 12:52:08 +08:00 · 2019-09-28 10:30:15 +08:00 · 2019-09-28 10:04:29 +08:00 · 2019-09-28 09:59:58 +08:00
12 changed files with 227 additions and 202 deletions
@@ -9,47 +9,39 @@ platform:
 steps:
 - name: vet
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - make vet
-  environment:
-    GO111MODULE: on
  volumes:
  - name: gopath
    path: /go

 - name: lint
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - make lint
-  environment:
-    GO111MODULE: on
  volumes:
  - name: gopath
    path: /go

 - name: misspell
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - make misspell-check
-  environment:
-    GO111MODULE: on
  volumes:
  - name: gopath
    path: /go

 - name: test
  pull: always
-  image: golang:1.12-alpine
+  image: golang:1.13-alpine
  commands:
  - apk add git make curl perl bash build-base zlib-dev ucl-dev
  - make ssh-server
  - make test
  - make coverage
-  environment:
-    GO111MODULE: on
  volumes:
  - name: gopath
    path: /go
@@ -76,12 +68,11 @@ platform:
 steps:
 - name: build-push
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp"
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
      exclude:
@@ -89,19 +80,18 @@ steps:

 - name: build-tag
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp"
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-scp
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
    - tag

 - name: executable
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - ./release/linux/amd64/drone-scp --help

@@ -140,8 +130,8 @@ steps:
 trigger:
  ref:
  - refs/heads/master
-  - "refs/pull/**"
-  - "refs/tags/**"
+  - refs/pull/**
+  - refs/tags/**

 depends_on:
 - testing
@@ -157,12 +147,11 @@ platform:
 steps:
 - name: build-push
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp"
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
      exclude:
@@ -170,19 +159,18 @@ steps:

 - name: build-tag
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp"
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-scp
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
    - tag

 - name: executable
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - ./release/linux/arm64/drone-scp --help

@@ -221,8 +209,8 @@ steps:
 trigger:
  ref:
  - refs/heads/master
-  - "refs/pull/**"
-  - "refs/tags/**"
+  - refs/pull/**
+  - refs/tags/**

 depends_on:
 - testing
@@ -238,12 +226,11 @@ platform:
 steps:
 - name: build-push
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp"
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
      exclude:
@@ -251,19 +238,18 @@ steps:

 - name: build-tag
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
-  - "go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp"
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-scp
  environment:
    CGO_ENABLED: 0
-    GO111MODULE: on
  when:
    event:
    - tag

 - name: executable
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - ./release/linux/arm/drone-scp --help

@@ -302,8 +288,8 @@ steps:
 trigger:
  ref:
  - refs/heads/master
-  - "refs/pull/**"
-  - "refs/tags/**"
+  - refs/pull/**
+  - refs/tags/**

 depends_on:
 - testing
@@ -319,11 +305,9 @@ platform:
 steps:
 - name: build-all-binary
  pull: always
-  image: golang:1.12
+  image: golang:1.13
  commands:
  - make release
-  environment:
-    GO111MODULE: on
  when:
    event:
    - tag
@@ -335,14 +319,14 @@ steps:
    api_key:
      from_secret: github_release_api_key
    files:
-    - "dist/release/*"
+    - dist/release/*
  when:
    event:
    - tag

 trigger:
  ref:
-  - "refs/tags/**"
+  - refs/tags/**

 depends_on:
 - testing
@@ -377,7 +361,7 @@ steps:
 trigger:
  ref:
  - refs/heads/master
-  - "refs/tags/**"
+  - refs/tags/**

 depends_on:
 - linux-amd64
@@ -140,13 +140,55 @@ pipeline:
      port: 22
 -     password: 1234
 +     password:
-        from_secret: ssh_password
+       from_secret: ssh_password
      target: /home/deploy/web
      source:
        - release/*.tar.gz
 ```

-# Parameter Reference
+Example configuration using command timeout:
+
+```diff
+pipeline:
+  scp:
+    image: appleboy/drone-scp
+    settings:
+      host:
+        - example1.com
+        - example2.com
+      user: ubuntu
+      password:
+        from_secret: ssh_password
+      port: 22
+-     command_timeout: 120
+     command_timeout: 2m
+      target: /home/deploy/web
+      source:
+        - release/*.tar.gz
+```
+
+Example configuration for ignore list:
+
+```diff
+pipeline:
+  scp:
+    image: appleboy/drone-scp
+    settings:
+      host:
+        - example1.com
+        - example2.com
+      user: ubuntu
+      password:
+        from_secret: ssh_password
+      port: 22
+      command_timeout: 2m
+      target: /home/deploy/web
+      source:
+       - !release/README.md
+        - release/*
+```
+
+## Parameter Reference

 host
 : target hostname or IP
@@ -175,6 +217,9 @@ rm
 timeout
 : timeout is the maximum amount of time for the TCP connection to establish

+command_timeout
+: timeout is the maximum amount of time for execute command
+
 strip_components
 : remove the specified number of leading path elements

@@ -196,7 +241,7 @@ proxy_key
 proxy_key_path
 : key path of proxy private key

-# Template Reference
+## Template Reference

 repo.owner
 : repository owner
@@ -8,6 +8,7 @@ DEPLOY_ACCOUNT := appleboy
 DEPLOY_IMAGE := $(EXECUTABLE)

 TARGETS ?= linux darwin windows
+ARCHS ?= amd64 386
 PACKAGES ?= $(shell $(GO) list ./...)
 SOURCES ?= $(shell find . -name "*.go" -type f)
 TAGS ?=
@@ -82,7 +83,7 @@ release-build:
 	@which gox > /dev/null; if [ $$? -ne 0 ]; then \
 		$(GO) get -u github.com/mitchellh/gox; \
 	fi
-	gox -os="$(TARGETS)" -tags="$(TAGS)" -ldflags="-s -w $(LDFLAGS)" -output="$(DIST)/binaries/$(EXECUTABLE)-$(VERSION)-{{.OS}}-{{.Arch}}"
+	gox -os="$(TARGETS)" -arch="$(ARCHS)" -tags="$(TAGS)" -ldflags="-s -w $(LDFLAGS)" -output="$(DIST)/binaries/$(EXECUTABLE)-$(VERSION)-{{.OS}}-{{.Arch}}"

 release-copy:
 	$(foreach file,$(wildcard $(DIST)/binaries/$(EXECUTABLE)-*),cp $(file) $(DIST)/release/$(notdir $(file));)
@@ -1,11 +1,11 @@
 # drone-scp

-[![GoDoc](https://godoc.org/github.com/appleboy/drone-scp?status.svg)](https://godoc.org/github.com/appleboy/drone-scp) 
+[![GoDoc](https://godoc.org/github.com/appleboy/drone-scp?status.svg)](https://godoc.org/github.com/appleboy/drone-scp)
 [![Build Status](https://cloud.drone.io/api/badges/appleboy/drone-scp/status.svg)](https://cloud.drone.io/appleboy/drone-scp)
-[![codecov](https://codecov.io/gh/appleboy/drone-scp/branch/master/graph/badge.svg)](https://codecov.io/gh/appleboy/drone-scp) 
-[![Go Report Card](https://goreportcard.com/badge/github.com/appleboy/drone-scp)](https://goreportcard.com/report/github.com/appleboy/drone-scp) 
-[![Docker Pulls](https://img.shields.io/docker/pulls/appleboy/drone-scp.svg)](https://hub.docker.com/r/appleboy/drone-scp/) 
-[![](https://images.microbadger.com/badges/image/appleboy/drone-scp.svg)](https://microbadger.com/images/appleboy/drone-scp "Get your own image badge on microbadger.com")
+[![codecov](https://codecov.io/gh/appleboy/drone-scp/branch/master/graph/badge.svg)](https://codecov.io/gh/appleboy/drone-scp)
+[![Go Report Card](https://goreportcard.com/badge/github.com/appleboy/drone-scp)](https://goreportcard.com/report/github.com/appleboy/drone-scp)
+[![Docker Pulls](https://img.shields.io/docker/pulls/appleboy/drone-scp.svg)](https://hub.docker.com/r/appleboy/drone-scp/)
+[![micro badger](https://images.microbadger.com/badges/image/appleboy/drone-scp.svg)](https://microbadger.com/images/appleboy/drone-scp "Get your own image badge on microbadger.com")

 Copy files and artifacts via SSH using a binary, docker or [Drone CI](http://docs.drone.io/).

@@ -18,17 +18,40 @@ Copy files and artifacts via SSH using a binary, docker or [Drone CI](http://doc
 * [x] Support load ssh key from absolute path or raw body.
 * [x] Support SSH ProxyCommand.

+```sh
+--------+       +----------+      +-----------+
+| Laptop | <-->  | Jumphost | <--> | FooServer |
+--------+       +----------+      +-----------+
+
+                   OR
+
+--------+       +----------+      +-----------+
+| Laptop | <-->  | Firewall | <--> | FooServer |
+--------+       +----------+      +-----------+
+192.168.1.5       121.1.2.3         10.10.29.68
 ```
-     +--------+       +----------+      +-----------+
-     | Laptop | <-->  | Jumphost | <--> | FooServer |
-     +--------+       +----------+      +-----------+

-                         OR
+## Breaking changes

-     +--------+       +----------+      +-----------+
-     | Laptop | <-->  | Firewall | <--> | FooServer |
-     +--------+       +----------+      +-----------+
-     192.168.1.5       121.1.2.3         10.10.29.68
+`v1.5.0`: change command timeout flag to `Duration`. See the following setting:
+
+```diff
+pipeline:
+  scp:
+    image: appleboy/drone-scp
+    settings:
+      host:
+        - example1.com
+        - example2.com
+      username: ubuntu
+      password:
+        from_secret: ssh_password
+      port: 22
+-     command_timeout: 120
+     command_timeout: 2m
+      target: /home/deploy/web
+      source:
+        - release/*.tar.gz
 ```

 ## Build or Download a binary
@@ -41,37 +64,29 @@ The pre-compiled binaries can be downloaded from [release page](https://github.c

 With `Go` installed

+```sh
+go get -u -v github.com/appleboy/drone-scp
 ```
-$ go get -u -v github.com/appleboy/drone-scp
-``` 

 or build the binary with the following command:

-```
-$ export GOOS=linux
-$ export GOARCH=amd64
-$ export CGO_ENABLED=0
-$ export GO111MODULE=on
+```sh
+export GOOS=linux
+export GOARCH=amd64
+export CGO_ENABLED=0
+export GO111MODULE=on

-$ go test -cover ./...
+go test -cover ./...

-$ go build -v -a -tags netgo -o release/linux/amd64/drone-scp .
+go build -v -a -tags netgo -o release/linux/amd64/drone-scp .
 ```

 ## Docker

 Build the docker image with the following commands:

-```
-$ make docker
-```
-
-Please note incorrectly building the image for the correct x64 linux and with
-CGO disabled will result in an error when running the Docker image:
-
-```
-docker: Error response from daemon: Container command
-'/bin/drone-scp' not found or does not exist..
+```sh
+make docker
 ```

 ## Usage
@@ -82,7 +97,6 @@ There are three ways to send notification.
 * [usage from docker](#usage-from-docker)
 * [usage from drone ci](#usage-from-drone-ci)

-<a name="usage-from-binary"></a>
 ### Usage from binary

 #### Using public key
@@ -117,8 +131,8 @@ eval `ssh-agent -s`

 Import your local public key `~/.ssh/id_rsa`

-```bash
-$ ssh-add
+```sh
+ssh-add
 ```

 You don't need to add `--password` or `--key-path` arguments.
@@ -145,10 +159,9 @@ drone-scp --host example1.com \
 + --source your_local_folder_path_2
 ```

-<a name="usage-from-docker"></a>
 ### Usage from docker

-#### Using public key
+Using public key

 ```bash
 docker run --rm \
@@ -163,7 +176,7 @@ docker run --rm \
  appleboy/drone-scp
 ```

-#### Using password
+Using password

 ```diff
 docker run --rm \
@@ -178,9 +191,7 @@ docker run --rm \
  appleboy/drone-scp
 ```

-#### Using ssh-agent
-
-Start your local ssh agent:
+Using ssh-agent, start your local ssh agent:

 ```bash
 eval `ssh-agent -s`
@@ -188,11 +199,11 @@ eval `ssh-agent -s`

 Import your local public key `~/.ssh/id_rsa`

-```bash
-$ ssh-add
+```sh
+ssh-add
 ```

-You don't need to add `SCP_PASSWORD` or `SCP_KEY_PATH ` arguments.
+You don't need to add `SCP_PASSWORD` or `SCP_KEY_PATH` arguments.

 ```bash
 docker run --rm \
@@ -206,7 +217,7 @@ docker run --rm \
  appleboy/drone-scp
 ```

-#### Send multiple source or target folder and hosts
+Send multiple source or target folder and hosts

 ```bash
 docker run --rm \
@@ -221,7 +232,6 @@ docker run --rm \
  appleboy/drone-scp
 ```

-<a name="usage-from-drone-ci"></a>
 ### Usage from drone ci

 Execute from the working directory:
@@ -247,6 +257,6 @@ You can get more [information](http://plugins.drone.io/appleboy/drone-scp/) abou

 Test the package with the following command:

-```
-$ make test
+```sh
+make test
 ```
@@ -1,16 +1,14 @@
 module github.com/appleboy/drone-scp

-go 1.12
+go 1.13

 require (
-	github.com/appleboy/com v0.0.1
-	github.com/appleboy/easyssh-proxy v0.0.0-20170511070730-14882d1d04ac
-	github.com/fatih/color v1.4.1
+	github.com/appleboy/com v0.0.2
+	github.com/appleboy/easyssh-proxy v1.2.0
+	github.com/fatih/color v1.7.0
 	github.com/joho/godotenv v1.3.0
-	github.com/mattn/go-colorable v0.1.1 // indirect
-	github.com/mattn/go-isatty v0.0.6 // indirect
-	github.com/stretchr/testify v1.3.0
-	github.com/urfave/cli v1.20.0
-	golang.org/x/crypto v0.0.0-20170413182223-cbc3d0884eac // indirect
-	golang.org/x/sys v0.0.0-20190302025703-b6889370fb10 // indirect
+	github.com/mattn/go-colorable v0.1.2 // indirect
+	github.com/mattn/go-isatty v0.0.9 // indirect
+	github.com/stretchr/testify v1.4.0
+	github.com/urfave/cli v1.22.1
 )
@@ -1,35 +1,41 @@
-github.com/appleboy/com v0.0.1 h1:SeP6J/YlZGWRwH7jdPYXXWA+qJy4GoQfcQFPda0ERYU=
-github.com/appleboy/com v0.0.1/go.mod h1:rtwjPnHClMOJw4K5oW3ASx9BCPCJ1SDbFbzJjY4Ebqw=
-github.com/appleboy/easyssh-proxy v0.0.0-20170511070730-14882d1d04ac h1:OcOz99ulMMpNqjpRVE8UBqFo5pyRamELU6xZuOR7GJs=
-github.com/appleboy/easyssh-proxy v0.0.0-20170511070730-14882d1d04ac/go.mod h1:bQbHdUQpAmc4Nv22/0slLXWdllbncGfA9ALkPuCe704=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/appleboy/com v0.0.2 h1:sexcPX7gp7peXMlOJMxEYcRucW7DW0XHgFZqUB6PI6g=
+github.com/appleboy/com v0.0.2/go.mod h1:jnufjIC3opMlReyPPPye+8JqNvUzLm25o7h6SOy8nv0=
+github.com/appleboy/easyssh-proxy v1.2.0 h1:KvaUGC18WkBFet+N1oofQy03jkC5HaKFn2XGxFxCTtg=
+github.com/appleboy/easyssh-proxy v1.2.0/go.mod h1:vHskChUNhxwW4dXMe2MNE/k+UBCkBagrQDm70UWZrS0=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.4.1 h1:YJhD/SoQqn7ev9zwhIm7lHTAqsOAF2AN4xlAVZzNZnU=
-github.com/fatih/color v1.4.1/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/mattn/go-colorable v0.1.1 h1:G1f5SKeVxmagw/IyvzvtZE4Gybcc4Tr1tf7I8z0XgOg=
-github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
-github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.6 h1:SrwhHcpV4nWrMGdNcC2kXpMfcBVYGDuTArqyhocJgvA=
-github.com/mattn/go-isatty v0.0.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
+github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1 h1:Zx8Rp9ozC4FPFxfEKRSUu8+Ay3sZxEUZ7JrCWMbGgvE=
-github.com/stretchr/testify v0.0.0-20170130113145-4d4bfba8f1d1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/urfave/cli v1.19.1 h1:0mKm4ZoB74PxYmZVua162y1dGt1qc10MyymYRBf3lb8=
-github.com/urfave/cli v1.19.1/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
-github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-golang.org/x/crypto v0.0.0-20170413182223-cbc3d0884eac h1:XuNEIEGF9/ewb6jVpjEjwb46FsNjTtgWCseDgY136n0=
-golang.org/x/crypto v0.0.0-20170413182223-cbc3d0884eac/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
+github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25 h1:jsG6UpNLt9iAsb0S2AGW28DveNzzgmbXR+ENoPjUeIU=
 golang.org/x/crypto v0.0.0-20190228161510-8dd112bcdc25/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190302025703-b6889370fb10 h1:xQJI9OEiErEQ++DoXOHqEpzsGMrAv2Q2jyCpi7DmfpQ=
-golang.org/x/sys v0.0.0-20190302025703-b6889370fb10/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
@@ -3,6 +3,7 @@ package main
 import (
 	"log"
 	"os"
+	"time"

 	"github.com/appleboy/easyssh-proxy"
 	"github.com/joho/godotenv"
@@ -12,16 +13,15 @@ import (

 // Version set at compile-time
 var (
-	Version  string
-	BuildNum string
+	Version string
 )

 func main() {
-
 	app := cli.NewApp()
 	app.Name = "Drone SCP"
 	app.Usage = "Copy files and artifacts via SSH."
-	app.Copyright = "Copyright (c) 2017 Bo-Yi Wu"
+	app.Copyright = "Copyright (c) 2019 Bo-Yi Wu"
+	app.Version = Version
 	app.Authors = []cli.Author{
 		{
 			Name:  "Bo-Yi Wu",
@@ -34,59 +34,59 @@ func main() {
 		cli.StringSliceFlag{
 			Name:   "host, H",
 			Usage:  "Server host",
-			EnvVar: "PLUGIN_HOST,SCP_HOST,SSH_HOST",
+			EnvVar: "PLUGIN_HOST,SCP_HOST,SSH_HOST,HOST,INPUT_HOST",
 		},
 		cli.StringFlag{
 			Name:   "port, P",
 			Value:  "22",
 			Usage:  "Server port, default to 22",
-			EnvVar: "PLUGIN_PORT,SCP_PORT,SSH_PORT",
+			EnvVar: "PLUGIN_PORT,SCP_PORT,SSH_PORT,PORT,INPUT_PORT",
 		},
 		cli.StringFlag{
 			Name:   "username, u",
 			Usage:  "Server username",
-			EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SCP_USERNAME,SSH_USERNAME",
+			EnvVar: "PLUGIN_USERNAME,PLUGIN_USER,SCP_USERNAME,SSH_USERNAME,USERNAME,INPUT_USERNAME",
 		},
 		cli.StringFlag{
 			Name:   "password, p",
 			Usage:  "Password for password-based authentication",
-			EnvVar: "PLUGIN_PASSWORD,SCP_PASSWORD,SSH_PASSWORD",
+			EnvVar: "PLUGIN_PASSWORD,SCP_PASSWORD,SSH_PASSWORD,PASSWORD,INPUT_PASSWORD",
 		},
 		cli.DurationFlag{
 			Name:   "timeout",
 			Usage:  "connection timeout",
-			EnvVar: "PLUGIN_TIMEOUT,SCP_TIMEOUT",
+			EnvVar: "PLUGIN_TIMEOUT,SCP_TIMEOUT,INPUT_TIMEOUT",
 		},
-		cli.IntFlag{
+		cli.DurationFlag{
 			Name:   "command.timeout,T",
 			Usage:  "command timeout",
-			EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT",
-			Value:  60,
+			EnvVar: "PLUGIN_COMMAND_TIMEOUT,SSH_COMMAND_TIMEOUT,INPUT_COMMAND_TIMEOUT",
+			Value:  60 * time.Second,
 		},
 		cli.StringFlag{
 			Name:   "key, k",
 			Usage:  "ssh private key",
-			EnvVar: "PLUGIN_KEY,SCP_KEY,SSH_KEY",
+			EnvVar: "PLUGIN_KEY,SCP_KEY,SSH_KEY,KEY,INPUT_KEY",
 		},
 		cli.StringFlag{
 			Name:   "key-path, i",
 			Usage:  "ssh private key path",
-			EnvVar: "PLUGIN_KEY_PATH,SCP_KEY_PATH,SSH_KEY_PATH",
+			EnvVar: "PLUGIN_KEY_PATH,SCP_KEY_PATH,SSH_KEY_PATH,INPUT_KEY_PATH",
 		},
 		cli.StringSliceFlag{
 			Name:   "target, t",
 			Usage:  "Target path on the server",
-			EnvVar: "PLUGIN_TARGET,SCP_TARGET",
+			EnvVar: "PLUGIN_TARGET,SCP_TARGET,TARGET,INPUT_TARGET",
 		},
 		cli.StringSliceFlag{
 			Name:   "source, s",
 			Usage:  "scp file list",
-			EnvVar: "PLUGIN_SOURCE,SCP_SOURCE",
+			EnvVar: "PLUGIN_SOURCE,SCP_SOURCE,SOURCE,INPUT_SOURCE",
 		},
 		cli.BoolFlag{
 			Name:   "rm, r",
 			Usage:  "remove target folder before upload data",
-			EnvVar: "PLUGIN_RM,SCP_RM",
+			EnvVar: "PLUGIN_RM,SCP_RM,RM,INPUT_RM",
 		},
 		cli.StringFlag{
 			Name:   "repo.owner",
@@ -148,55 +148,55 @@ func main() {
 		cli.StringFlag{
 			Name:   "proxy.ssh-key",
 			Usage:  "private ssh key of proxy",
-			EnvVar: "PLUGIN_PROXY_SSH_KEY,PLUGIN_PROXY_KEY,PROXY_SSH_KEY",
+			EnvVar: "PLUGIN_PROXY_SSH_KEY,PLUGIN_PROXY_KEY,PROXY_SSH_KEY,PROXY_KEY,INPUT_PROXY_SSH_KEY",
 		},
 		cli.StringFlag{
 			Name:   "proxy.key-path",
 			Usage:  "ssh private key path of proxy",
-			EnvVar: "PLUGIN_PROXY_KEY_PATH,PROXY_SSH_KEY_PATH",
+			EnvVar: "PLUGIN_PROXY_KEY_PATH,PROXY_SSH_KEY_PATH,INPUT_PROXY_SSH_KEY_PATH",
 		},
 		cli.StringFlag{
 			Name:   "proxy.username",
 			Usage:  "connect as user of proxy",
-			EnvVar: "PLUGIN_PROXY_USERNAME,PLUGIN_PROXY_USER,PROXY_SSH_USERNAME",
+			EnvVar: "PLUGIN_PROXY_USERNAME,PLUGIN_PROXY_USER,PROXY_SSH_USERNAME,PROXY_USERNAME,INPUT_PROXY_USERNAME",
 			Value:  "root",
 		},
 		cli.StringFlag{
 			Name:   "proxy.password",
 			Usage:  "user password of proxy",
-			EnvVar: "PLUGIN_PROXY_PASSWORD,PROXY_SSH_PASSWORD",
+			EnvVar: "PLUGIN_PROXY_PASSWORD,PROXY_SSH_PASSWORD,PROXY_PASSWORD,INPUT_PROXY_PASSWORD",
 		},
 		cli.StringFlag{
 			Name:   "proxy.host",
 			Usage:  "connect to host of proxy",
-			EnvVar: "PLUGIN_PROXY_HOST,PROXY_SSH_HOST",
+			EnvVar: "PLUGIN_PROXY_HOST,PROXY_SSH_HOST,PROXY_HOST,INPUT_PROXY_HOST",
 		},
 		cli.StringFlag{
 			Name:   "proxy.port",
 			Usage:  "connect to port of proxy",
-			EnvVar: "PLUGIN_PROXY_PORT,PROXY_SSH_PORT",
+			EnvVar: "PLUGIN_PROXY_PORT,PROXY_SSH_PORT,PROXY_PORT,INPUT_PROXY_PORT",
 			Value:  "22",
 		},
 		cli.DurationFlag{
 			Name:   "proxy.timeout",
 			Usage:  "proxy connection timeout",
-			EnvVar: "PLUGIN_PROXY_TIMEOUT,PROXY_SSH_TIMEOUT",
+			EnvVar: "PLUGIN_PROXY_TIMEOUT,PROXY_SSH_TIMEOUT,INPUT_PROXY_TIMEOUT",
 		},
 		cli.IntFlag{
 			Name:   "strip.components",
 			Usage:  "Remove the specified number of leading path elements.",
-			EnvVar: "PLUGIN_STRIP_COMPONENTS,TAR_STRIP_COMPONENTS",
+			EnvVar: "PLUGIN_STRIP_COMPONENTS,TAR_STRIP_COMPONENTS,INPUT_STRIP_COMPONENTS",
 		},
 		cli.StringFlag{
 			Name:   "tar.exec",
 			Usage:  "Alternative `tar` executable to on the dest host",
-			EnvVar: "PLUGIN_TAR_EXEC,SCP_TAR_EXEC",
+			EnvVar: "PLUGIN_TAR_EXEC,SCP_TAR_EXEC,INPUT_TAR_EXEC",
 			Value:  "tar",
 		},
 		cli.BoolFlag{
 			Name:   "debug",
 			Usage:  "remove target folder before upload data",
-			EnvVar: "PLUGIN_DEBUG,DEBUG",
+			EnvVar: "PLUGIN_DEBUG,DEBUG,INPUT_DEBUG",
 		},
 	}

@@ -232,14 +232,9 @@ VERSION:
 REPOSITORY:
    Github: https://github.com/appleboy/drone-scp
 `
-	app.Version = Version
-
-	if BuildNum != "" {
-		app.Version = app.Version + "+" + BuildNum
-	}

 	if err := app.Run(os.Args); err != nil {
-		log.Println(err)
+		log.Fatal(err)
 	}
 }

@@ -269,7 +264,7 @@ func run(c *cli.Context) error {
 			Username:        c.String("username"),
 			Password:        c.String("password"),
 			Timeout:         c.Duration("timeout"),
-			CommandTimeout:  c.Int("command.timeout"),
+			CommandTimeout:  c.Duration("command.timeout"),
 			Key:             c.String("key"),
 			KeyPath:         c.String("key-path"),
 			Target:          c.StringSlice("target"),
@@ -1,4 +1,4 @@
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build !windows

 package main

@@ -1,6 +1,8 @@
 package main

-import "testing"
+import (
+	"testing"
+)

 func TestGetRealPath(t *testing.T) {
 	type args struct {
@@ -9,11 +9,8 @@
    steps: [
      {
        name: 'vet',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
        commands: [
          'make vet',
        ],
@@ -26,11 +23,8 @@
      },
      {
        name: 'lint',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
        commands: [
          'make lint',
        ],
@@ -43,11 +37,8 @@
      },
      {
        name: 'misspell',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
        commands: [
          'make misspell-check',
        ],
@@ -60,11 +51,8 @@
      },
      {
        name: 'test',
-        image: 'golang:1.12-alpine',
+        image: 'golang:1.13-alpine',
        pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
        commands: [
          'apk add git make curl perl bash build-base zlib-dev ucl-dev',
          'make ssh-server',
@@ -105,11 +93,10 @@
    steps: [
      {
        name: 'build-push',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
        environment: {
          CGO_ENABLED: '0',
-          GO111MODULE: 'on',
        },
        commands: [
          'go build -v -ldflags \'-X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name,
@@ -122,11 +109,10 @@
      },
      {
        name: 'build-tag',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
        environment: {
          CGO_ENABLED: '0',
-          GO111MODULE: 'on',
        },
        commands: [
          'go build -v -ldflags \'-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\' -a -o release/' + os + '/' + arch + '/' + name,
@@ -137,7 +123,7 @@
      },
      {
        name: 'executable',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
        commands: [
          './release/' + os + '/' + arch + '/' + name + ' --help',
@@ -202,11 +188,8 @@
    steps: [
      {
        name: 'build-all-binary',
-        image: 'golang:1.12',
+        image: 'golang:1.13',
        pull: 'always',
-        environment: {
-          GO111MODULE: 'on',
-        },
        commands: [
          'make release'
        ],
@@ -51,7 +51,7 @@ type (
 		Key             string
 		KeyPath         string
 		Timeout         time.Duration
-		CommandTimeout  int
+		CommandTimeout  time.Duration
 		Target          []string
 		Source          []string
 		Remove          bool
@@ -237,8 +237,8 @@ func (p *Plugin) Exec() error {

 	wg := sync.WaitGroup{}
 	wg.Add(len(p.Config.Host))
-	errChannel := make(chan error, 1)
-	finished := make(chan bool, 1)
+	errChannel := make(chan error)
+	finished := make(chan struct{})
 	for _, host := range p.Config.Host {
 		go func(host string) {
 			// Create MakeConfig instance with remote username, server address and path to private key.
@@ -6,6 +6,7 @@ import (
 	"os/user"
 	"path/filepath"
 	"testing"
+	"time"

 	"github.com/appleboy/easyssh-proxy"
 	"github.com/stretchr/testify/assert"
@@ -98,7 +99,7 @@ func TestSCPFileFromPublicKey(t *testing.T) {
 			KeyPath:        "tests/.ssh/id_rsa",
 			Source:         []string{"tests/a.txt", "tests/b.txt"},
 			Target:         []string{filepath.Join(u.HomeDir, "/test")},
-			CommandTimeout: 60,
+			CommandTimeout: 60 * time.Second,
 			TarExec:        "tar",
 		},
 	}
@@ -148,7 +149,7 @@ func TestSCPWildcardFileList(t *testing.T) {
 			KeyPath:        "tests/.ssh/id_rsa",
 			Source:         []string{"tests/global/*"},
 			Target:         []string{filepath.Join(u.HomeDir, "abc")},
-			CommandTimeout: 60,
+			CommandTimeout: 60 * time.Second,
 			TarExec:        "tar",
 		},
 	}
@@ -180,7 +181,7 @@ func TestSCPFromProxySetting(t *testing.T) {
 			KeyPath:        "tests/.ssh/id_rsa",
 			Source:         []string{"tests/global/*"},
 			Target:         []string{filepath.Join(u.HomeDir, "def")},
-			CommandTimeout: 60,
+			CommandTimeout: 60 * time.Second,
 			TarExec:        "tar",
 			Proxy: easyssh.DefaultConfig{
 				Server:  "localhost",
@@ -225,7 +226,7 @@ func TestStripComponentsFlag(t *testing.T) {
 			Source:          []string{"tests/global/*"},
 			StripComponents: 2,
 			Target:          []string{filepath.Join(u.HomeDir, "123")},
-			CommandTimeout:  60,
+			CommandTimeout:  60 * time.Second,
 			TarExec:         "tar",
 		},
 	}
@@ -264,7 +265,7 @@ func TestIgnoreList(t *testing.T) {
 			Source:          []string{"tests/global/*", "!tests/global/c.txt", "!tests/global/e.txt"},
 			StripComponents: 2,
 			Target:          []string{filepath.Join(u.HomeDir, "ignore")},
-			CommandTimeout:  60,
+			CommandTimeout:  60 * time.Second,
 			TarExec:         "tar",
 		},
 	}
@@ -342,7 +343,7 @@ func TestIncorrectPassword(t *testing.T) {
 			Password:       "123456",
 			Source:         []string{"tests/a.txt", "tests/b.txt"},
 			Target:         []string{"/home"},
-			CommandTimeout: 60,
+			CommandTimeout: 60 * time.Second,
 			TarExec:        "tar",
 		},
 	}
@@ -365,7 +366,7 @@ func TestNoPermissionCreateFolder(t *testing.T) {
 			KeyPath:        "tests/.ssh/id_rsa",
 			Source:         []string{"tests/a.txt", "tests/b.txt"},
 			Target:         []string{"/etc/test"},
-			CommandTimeout: 60,
+			CommandTimeout: 60 * time.Second,
 			TarExec:        "tar",
 		},
 	}
@@ -440,7 +441,7 @@ func TestRemoveDestFile(t *testing.T) {
 	}
 	plugin := Plugin{
 		Config: Config{
-			CommandTimeout: 60,
+			CommandTimeout: 60 * time.Second,
 		},
 		DestFile: "/etc/resolv.conf",
 	}
Author	SHA1	Message	Date
Bo-Yi Wu	c8dbddab25	chore: support -arch=	2019-09-28 14:14:15 +08:00
Bo-Yi Wu	1b27d28b27	chore: upgrade package	2019-09-28 12:52:08 +08:00
Bo-Yi Wu	8a0b0f3c0c	chore(GitHub): support actions parameter.	2019-09-28 10:30:15 +08:00
Bo-Yi Wu	ec489106f9	chore: upgrade to go1.13	2019-09-28 10:04:29 +08:00
Bo-Yi Wu	9ed20ee32d	docs: fix markdown lint	2019-09-28 09:59:58 +08:00
Bo-Yi Wu	2aee5a3df1	docs: update	2019-08-03 23:51:16 +08:00
Bo-Yi Wu	bc633e27cf	docs: fix markdown lint	2019-08-03 18:55:27 +08:00
Bo-Yi Wu	9dad691d4f	docs: update example	2019-08-03 18:55:02 +08:00
Bo-Yi Wu	66579b6dae	chore: add proxy variable	2019-05-11 19:51:39 +08:00
Bo-Yi Wu	06609f35cf	add key variable Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2019-05-11 16:50:50 +08:00
Bo-Yi Wu	c9771cce78	chore: add variable	2019-05-11 16:49:20 +08:00
Bo-Yi Wu	6088f7da5a	chore: update build tag	2019-05-11 16:34:36 +08:00
Bo-Yi Wu	6de8f74170	docs: add ignore list example.	2019-05-11 14:34:40 +08:00
Bo-Yi Wu	bb63d55f89	Update README.md	2019-05-09 14:08:52 +08:00
Bo-Yi Wu	da44b071c4	chore: switch finished to struct{} for zero allocate (#96 )	2019-03-30 07:26:53 +08:00
Bo-Yi Wu	a7eddc4b11	docs: fix setting Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2019-03-11 17:22:33 +08:00
Bo-Yi Wu	813faf56be	chore: remove build number	2019-03-10 23:43:06 +08:00
Bo-Yi Wu	4117d2ca30	fix: trigger build fail if error (#94 ) fix #93	2019-03-10 23:41:21 +08:00
Bo-Yi Wu	15bd1a11e4	chore: change command timeout flag (#92 ) * chore: change command timeout flag Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com> * docs: update setting Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com> * doc: update readme. Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>	2019-03-07 13:56:40 +08:00