Merge pull request #402 from moul/dev/moul/maintenance

.github/workflows/ci.yml

@@ -30,8 +30,8 @@ jobs:
     strategy:
       matrix:
         golang:
-          #- 1.13
-          - 1.14
+          - 1.15.x
+          - 1.16.x
     steps:
       - uses: actions/checkout@v2
       - name: Install Go
@@ -47,7 +47,8 @@ jobs:
     strategy:
       matrix:
         golang:
-          - 1.14
+          - 1.15.x
+          - 1.16.x
     steps:
       - uses: actions/checkout@v2
       - name: Install Go
@@ -68,10 +69,10 @@ jobs:
     strategy:
       matrix:
         golang:
-          - 1.11
-          - 1.12
-          - 1.13
-          - 1.14
+          - 1.13.x
+          - 1.14.x
+          - 1.15.x
+          - 1.16.x
     steps:
       - uses: actions/checkout@v2
       - name: Install Go

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 coverage.txt
 contrib/docker/entrypoint
 /advanced-ssh-config

Dockerfile

@@ -4,7 +4,7 @@ ARG             VCS_REF
 ARG             VERSION
 
 # build
-FROM            golang:1.15-alpine as builder
+FROM            golang:1.16-alpine as builder
 RUN             apk add --no-cache git gcc musl-dev make
 ENV             GO111MODULE=on
 WORKDIR         /go/src/moul.io/assh

Makefile

@@ -42,7 +42,7 @@ gen-release: generate
 	GOOS=openbsd GOARCH=386   go build $(GO_INSTALL_OPTS) -i -v -o .release/assh_openbsd_386   .
 	GOOS=openbsd GOARCH=arm   go build $(GO_INSTALL_OPTS) -i -v -o .release/assh_openbsd_arm   .
 	GOOS=darwin  GOARCH=amd64 go build $(GO_INSTALL_OPTS) -i -v -o .release/assh_darwin_amd64  .
-	GOOS=darwin  GOARCH=386   go build $(GO_INSTALL_OPTS) -i -v -o .release/assh_darwin_386    .
+	#GOOS=darwin  GOARCH=386   go build $(GO_INSTALL_OPTS) -i -v -o .release/assh_darwin_386    .
 	#GOOS=darwin  GOARCH=arm   go build $(GO_INSTALL_OPTS) -i -v -o .release/assh_darwin_arm    .
 	GOOS=netbsd  GOARCH=amd64 go build $(GO_INSTALL_OPTS) -i -v -o .release/assh_netbsd_amd64  .
 	GOOS=netbsd  GOARCH=386   go build $(GO_INSTALL_OPTS) -i -v -o .release/assh_netbsd_386    .