chore(release): support multiple platform

.drone.jsonnet

@@ -4,13 +4,13 @@ local name = 'drone-ssh';
 [
   pipeline.test,
   pipeline.build(name, 'linux', 'amd64'),
-  // pipeline.build(name, 'linux', 'arm64'),
-  // pipeline.build(name, 'linux', 'arm'),
+  pipeline.build(name, 'linux', 'arm64'),
+  pipeline.build(name, 'linux', 'arm'),
   pipeline.release,
   pipeline.notifications(depends_on=[
     'linux-amd64',
-    // 'linux-arm64',
-    // 'linux-arm',
+    'linux-arm64',
+    'linux-arm',
     'release-binary',
   ]),
 ]

.drone.yml

@@ -7,7 +7,7 @@ platform:
 steps:
 - commands:
   - make vet
-  image: golang:1.19
+  image: golang:1.18
   name: vet
   pull: always
   volumes:
@@ -35,7 +35,7 @@ steps:
   - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/amd64/drone-ssh
   environment:
     CGO_ENABLED: "0"
-  image: golang:1.19
+  image: golang:1.18
   name: build-push
   pull: always
   when:
@@ -47,7 +47,7 @@ steps:
     -a -o release/linux/amd64/drone-ssh
   environment:
     CGO_ENABLED: "0"
-  image: golang:1.19
+  image: golang:1.18
   name: build-tag
   pull: always
   when:
@@ -55,7 +55,7 @@ steps:
     - tag
 - commands:
   - ./release/linux/amd64/drone-ssh --help
-  image: golang:1.19
+  image: golang:1.18
   name: executable
   pull: always
 - image: plugins/docker:linux-amd64
@@ -98,6 +98,150 @@ trigger:
 depends_on:
 - testing
 kind: pipeline
+name: linux-arm64
+platform:
+  arch: arm64
+  os: linux
+steps:
+- commands:
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm64/drone-ssh
+  environment:
+    CGO_ENABLED: "0"
+  image: golang:1.18
+  name: build-push
+  pull: always
+  when:
+    event:
+      exclude:
+      - tag
+- commands:
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}'
+    -a -o release/linux/arm64/drone-ssh
+  environment:
+    CGO_ENABLED: "0"
+  image: golang:1.18
+  name: build-tag
+  pull: always
+  when:
+    event:
+    - tag
+- commands:
+  - ./release/linux/arm64/drone-ssh --help
+  image: golang:1.18
+  name: executable
+  pull: always
+- image: plugins/docker:linux-arm64
+  name: dryrun
+  pull: always
+  settings:
+    cache_from: appleboy/drone-ssh
+    daemon_off: false
+    dockerfile: docker/Dockerfile.linux.arm64
+    dry_run: true
+    repo: appleboy/drone-ssh
+    tags: linux-arm64
+  when:
+    event:
+    - pull_request
+- image: plugins/docker:linux-arm64
+  name: publish
+  pull: always
+  settings:
+    auto_tag: true
+    auto_tag_suffix: linux-arm64
+    cache_from: appleboy/drone-ssh
+    daemon_off: "false"
+    dockerfile: docker/Dockerfile.linux.arm64
+    password:
+      from_secret: docker_password
+    repo: appleboy/drone-ssh
+    username:
+      from_secret: docker_username
+  when:
+    event:
+      exclude:
+      - pull_request
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/pull/**
+  - refs/tags/**
+---
+depends_on:
+- testing
+kind: pipeline
+name: linux-arm
+platform:
+  arch: arm
+  os: linux
+steps:
+- commands:
+  - go build -v -ldflags '-X main.build=${DRONE_BUILD_NUMBER}' -a -o release/linux/arm/drone-ssh
+  environment:
+    CGO_ENABLED: "0"
+  image: golang:1.18
+  name: build-push
+  pull: always
+  when:
+    event:
+      exclude:
+      - tag
+- commands:
+  - go build -v -ldflags '-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}'
+    -a -o release/linux/arm/drone-ssh
+  environment:
+    CGO_ENABLED: "0"
+  image: golang:1.18
+  name: build-tag
+  pull: always
+  when:
+    event:
+    - tag
+- commands:
+  - ./release/linux/arm/drone-ssh --help
+  image: golang:1.18
+  name: executable
+  pull: always
+- image: plugins/docker:linux-arm
+  name: dryrun
+  pull: always
+  settings:
+    cache_from: appleboy/drone-ssh
+    daemon_off: false
+    dockerfile: docker/Dockerfile.linux.arm
+    dry_run: true
+    repo: appleboy/drone-ssh
+    tags: linux-arm
+  when:
+    event:
+    - pull_request
+- image: plugins/docker:linux-arm
+  name: publish
+  pull: always
+  settings:
+    auto_tag: true
+    auto_tag_suffix: linux-arm
+    cache_from: appleboy/drone-ssh
+    daemon_off: "false"
+    dockerfile: docker/Dockerfile.linux.arm
+    password:
+      from_secret: docker_password
+    repo: appleboy/drone-ssh
+    username:
+      from_secret: docker_username
+  when:
+    event:
+      exclude:
+      - pull_request
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/pull/**
+  - refs/tags/**
+---
+depends_on:
+- testing
+kind: pipeline
 name: release-binary
 platform:
   arch: amd64
@@ -106,7 +250,7 @@ steps:
 - commands:
   - export PATH=$PATH:$GOPATH/bin
   - make release
-  image: techknowlogick/xgo:go-1.19.x
+  image: techknowlogick/xgo:go-1.18.x
   name: build-all-binary
   pull: always
   when:
@@ -129,6 +273,8 @@ trigger:
 ---
 depends_on:
 - linux-amd64
+- linux-arm64
+- linux-arm
 - release-binary
 kind: pipeline
 name: notifications

.github/workflows/go.yml

@@ -21,5 +21,44 @@ jobs:
       - name: Setup golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.50.1
+          version: v1.46.2
           args: --verbose
+
+  # build:
+  #   strategy:
+  #     matrix:
+  #       os: [ubuntu-latest]
+  #       go: [ 1.18]
+  #       include:
+  #         - os: ubuntu-latest
+  #           go-build: ~/.cache/go-build
+  #   name: ${{ matrix.os }} @ Go ${{ matrix.go }}
+  #   runs-on: ${{ matrix.os }}
+  #   env:
+  #     GO111MODULE: on
+  #     GOPROXY: https://proxy.golang.org
+  #   steps:
+  #     - name: Set up Go ${{ matrix.go }}
+  #       uses: actions/setup-go@v3
+  #       with:
+  #         go-version: ${{ matrix.go }}
+
+  #     - name: Checkout Code
+  #       uses: actions/checkout@v3
+  #       with:
+  #         ref: ${{ github.ref }}
+
+  #     - uses: actions/cache@v3
+  #       with:
+  #         path: |
+  #           ${{ matrix.go-build }}
+  #           ~/go/pkg/mod
+  #         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-go-
+  #     - name: initial docker
+  #       uses: docker-practice/actions-setup-docker@master
+  #     - name: build all binaries
+  #       run: |
+  #         set -x
+  #         make release

.github/workflows/goreleaser.yml

@@ -1,34 +0,0 @@
-name: Goreleaser
-
-on:
-  push:
-    tags:
-      - '*'
-
-permissions:
-  contents: write
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      -
-        name: Set up Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.18
-      -
-        name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v3
-        with:
-          # either 'goreleaser' (default) or 'goreleaser-pro'
-          distribution: goreleaser
-          version: latest
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -133,7 +133,7 @@ deps-backend:
 	$(GO) install $(XGO_PACKAGE)
 
 .PHONY: release
-release: release-linux release-copy release-compress release-check
+release: release-windows release-linux release-darwin release-copy release-compress release-check
 
 $(DIST_DIRS):
 	mkdir -p $(DIST_DIRS)

go.mod

@@ -5,18 +5,18 @@ go 1.18
 require (
 	github.com/appleboy/easyssh-proxy v1.3.9
 	github.com/joho/godotenv v1.4.0
-	github.com/stretchr/testify v1.8.1
-	github.com/urfave/cli v1.22.10
-	golang.org/x/crypto v0.3.0
+	github.com/stretchr/testify v1.7.2
+	github.com/urfave/cli v1.22.9
+	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
 )
 
 require (
-	github.com/ScaleFT/sshkeys v1.2.0 // indirect
+	github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.0 // indirect
 	github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,15 +1,13 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5 h1:VauE2GcJNZFun2Och6tIT2zJZK1v6jxALQDA9BIji/E=
 github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5/go.mod h1:gxOHeajFfvGQh/fxlC8oOKBe23xnnJTif00IFFbiT+o=
-github.com/ScaleFT/sshkeys v1.2.0 h1:5BRp6rTVIhJzXT3VcUQrKgXR8zWA3sOsNeuyW15WUA8=
-github.com/ScaleFT/sshkeys v1.2.0/go.mod h1:gxOHeajFfvGQh/fxlC8oOKBe23xnnJTif00IFFbiT+o=
 github.com/appleboy/easyssh-proxy v1.3.9 h1:b+sVSTz+cVFvfA23HQywMMpm0s5g3gH7jYdBcQqaCQI=
 github.com/appleboy/easyssh-proxy v1.3.9/go.mod h1:G1eQomBEME7NWKA3hE49s5HsT44S5fn0aBxX7k9Yjug=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+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/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a h1:saTgr5tMLFnmy/yg3qDTft4rE5DY2uJ/cCxCe3q0XTU=
 github.com/dchest/bcrypt_pbkdf v0.0.0-20150205184540-83f37f9c154a/go.mod h1:Bw9BbhOJVNR+t0jCqx2GC6zv0TGBsShs56Y3gfSCvl0=
 github.com/joho/godotenv v1.4.0 h1:3l4+N6zfMWnkbPEXKng2o2/MR5mSwTrBih4ZEkkz1lg=
@@ -21,30 +19,26 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 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/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/urfave/cli v1.22.10 h1:p8Fspmz3iTctJstry1PYS3HVdllxnEzTEsgIgtxTrCk=
-github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/urfave/cli v1.22.9 h1:cv3/KhXGBGjEXLC4bH0sLuJ9BewaAbpk5oyMOveu4pw=
+github.com/urfave/cli v1.22.9/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
-golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
+golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098 h1:PgOr27OhUx2IRqGJ2RxAWI4dJQ7bi9cSrB82uzFzfUA=
+golang.org/x/sys v0.0.0-20220614162138-6c1b26c55098/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 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=

pipeline.libsonnet

@@ -9,7 +9,7 @@
     steps: [
       {
         name: 'vet',
-        image: 'golang:1.19',
+        image: 'golang:1.18',
         pull: 'always',
         commands: [
           'make vet',
@@ -23,7 +23,7 @@
       },
       // {
       //   name: 'test',
-      //   image: 'golang:1.19-alpine',
+      //   image: 'golang:1.18-alpine',
       //   pull: 'always',
       //   commands: [
       //     'apk add git make curl perl bash build-base zlib-dev ucl-dev',
@@ -65,7 +65,7 @@
     steps: [
       {
         name: 'build-push',
-        image: 'golang:1.19',
+        image: 'golang:1.18',
         pull: 'always',
         environment: {
           CGO_ENABLED: '0',
@@ -81,7 +81,7 @@
       },
       {
         name: 'build-tag',
-        image: 'golang:1.19',
+        image: 'golang:1.18',
         pull: 'always',
         environment: {
           CGO_ENABLED: '0',
@@ -95,7 +95,7 @@
       },
       {
         name: 'executable',
-        image: 'golang:1.19',
+        image: 'golang:1.18',
         pull: 'always',
         commands: [
           './release/' + os + '/' + arch + '/' + name + ' --help',
@@ -160,7 +160,7 @@
     steps: [
       {
         name: 'build-all-binary',
-        image: 'techknowlogick/xgo:go-1.19.x',
+        image: 'techknowlogick/xgo:go-1.18.x',
         pull: 'always',
         commands: [
           'export PATH=$PATH:$GOPATH/bin',

plugin.go

@@ -127,13 +127,9 @@ func (p Plugin) exec(host string, wg *sync.WaitGroup, errChannel chan error) {
 			case isTimeout = <-doneChan:
 				break loop
 			case outline := <-stdoutChan:
-				if outline != "" {
-					p.log(host, "out:", outline)
-				}
+				p.log(host, "out:", outline)
 			case errline := <-stderrChan:
-				if errline != "" {
-					p.log(host, "err:", errline)
-				}
+				p.log(host, "err:", errline)
 			case err = <-errChan:
 			}
 		}

plugin_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"io"
+	"io/ioutil"
 	"os"
 	"reflect"
 	"strings"
@@ -409,7 +410,7 @@ func TestWrongFingerprint(t *testing.T) {
 func getHostPublicKeyFile(keypath string) (ssh.PublicKey, error) {
 	var pubkey ssh.PublicKey
 	var err error
-	buf, err := os.ReadFile(keypath)
+	buf, err := ioutil.ReadFile(keypath)
 	if err != nil {
 		return nil, err
 	}