update to golangci-lint 1.27

increase golangci lint timeout
Travis testing (#85)
* fix arch setup
* use dpl v2

Author: aztechian

.gitignore

@@ -16,7 +16,7 @@
 **/asset/templates.go
 /packages
 /main
-/bridgr
+/bridgr-*
 *.sha256
 code-quality-report.json
 

.golangci.yml

@@ -13,5 +13,9 @@ linters:
     - gomnd
 run:
   tests: false
+  timeout: 3m0s
+  out-format: colored-line-number
+  skip-dirs: /home/travis/gopath/pkg/mod
+  modules-download-mode: readonly
 service:
-  golangci-lint-version: 1.24.x
+  golangci-lint-version: 1.27.x

.travis.yml

@@ -2,11 +2,6 @@ language: go
 dist: xenial
 os:
   - linux
-env:
-  global:
-    # Force-enable Go modules. This will be unnecessary when Go 1.13 lands.
-    - GO111MODULE=on
-    - GOARCH=amd64
 stages:
   - checks
   - test
@@ -16,46 +11,82 @@ go:
 cache:
   directories: [$GOPATH/pkg/mod]
 
-# Only clone the most recent commit.
+# clone the full repo
 git:
-  depth: 1
+  depth: false
 
 install: true
 
+notifications:
+  email:
+    on_success: change
+    on_failure: always
+
 # script always runs to completion (set +e). If we have linter issues AND a
 # failing test, we want to see both. Configure golangci-lint with a
 # .golangci.yml file at the top level of your repo.
 jobs:
   include:
     - stage: checks
       # script: golangci-lint run # run a bunch of code checkers/linters in parallel
-      script:
-        - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0
+      before_script:
+        - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.27.0
+<<<<<<< HEAD
         - golangci-lint --version # test that we got it
+        - pwd; ls -altr; ls -alR
+=======
+      script:
+>>>>>>> de22ee4... Travis testing (#85)
         - make download
         - make lint
     - stage: test
       script:
-        - make coverage && bash <(curl -s https://codecov.io/bash)
+        - make coverage
+      after_success:
+        - bash <(curl -s https://codecov.io/bash)
         # trigger goreportcard scan
         - curl -s -d "repo=github.com/$TRAVIS_REPO_SLUG" https://goreportcard.com/checks
     - stage: build
-      script: GOOS=linux make #need this here because gvm resets the GOOS var from the "env:" line
+      script:
+        - GOOS=linux make # gimmie and gvm don't pass through GOOS variables :(
+        - ls -altr
+      arch: amd64
       env: GOOS=linux
     - stage: build
-      script: GOOS=windows make
+      script:
+        - GOOS=linux make
+        - ls -altr
+      arch: arm64
+      env: GOOS=linux
+    - stage: build
+      script:
+        - GOOS=windows make
+        - ls -altr
+      arch: amd64
       env: GOOS=windows
     - stage: build
-      script: GOOS=darwin make
+      script:
+        - GOOS=darwin make
+        - ls -altr
+      arch: amd64
       env: GOOS=darwin
+    # fails to build darwin/arm64 combo
+    # - stage: build
+    #   script:
+    #     - GOOS=darwin make
+    #     - ls -altr
+    #   arch: arm64
+    #   env: GOOS=darwin
 
 deploy:
-  on:
-    tags: true
-    condition: $TRAVIS_BUILD_STAGE_NAME = Build
-  provider: releases
-  api_key:
-    secure: BsjDpZkQEG+gH87ZZC4qWb4xRQhAO22Yg08H/2eZXVzO5eSuXDL96peCBy+3jozlJ5mMDbwXnnAs9EnWBWyIMeNkLev2MoKXm3xTVI6yNxc4pflBmBg4mu3YFQQmZTqtzFr3NBy5+tcL6h/3S0KEShOb9J7csUsimHzZfA19wbOZjdyqNXo9poDekeHnT++3k/NRDfjrsDTUgUUzBYs5yNh2vVKNjcgihiv61eHlbWjgwLjJYR08po+6PCJ6hLwg3/TXqe0r7PUeNJaTk2NdY69LPxXh3sRfbmXibA8a7IudI8uLfSOKrrw6+tWDUWMz4vHfb4ETZx71wwhcBgIs5NPQJw4vlknm89kv+7aJBwjVRI9zoz9tX/TGqXSVo7C1yM3Ic788na74L2m8U6rGYUeGEAai1wbYVUqRi9hpMAhWImtKqHDFYGYI/EYoE3Rco5bpM4xx1LT/tqdu44CpPNbkzWcJF+2yxroyY/ze/mL63YwJxOCtQwXSICkawbHtmS+m9EOGjskWQ0nKIb/mpFBEhIxYJl6wTUrYvzmK/nIvO9O27b+GGk6NgFXzkY+OKoMMIL721KkKMQTH2fDPh9/GB69NVkE2olbtqL0lfxEJQ5uzdQX1LsfjM/P2qRHdrGh9oQ2PYiRDoG04R9TC4rlLNlmNUb365A+5q62WH5A=
-  file_glob: true
-  file: bridgr-*
-  skip_cleanup: true
+  - provider: releases
+    edge: true
+    on:
+      tags: true
+      condition: $TRAVIS_BUILD_STAGE_NAME = build
+    token:
+      secure: BsjDpZkQEG+gH87ZZC4qWb4xRQhAO22Yg08H/2eZXVzO5eSuXDL96peCBy+3jozlJ5mMDbwXnnAs9EnWBWyIMeNkLev2MoKXm3xTVI6yNxc4pflBmBg4mu3YFQQmZTqtzFr3NBy5+tcL6h/3S0KEShOb9J7csUsimHzZfA19wbOZjdyqNXo9poDekeHnT++3k/NRDfjrsDTUgUUzBYs5yNh2vVKNjcgihiv61eHlbWjgwLjJYR08po+6PCJ6hLwg3/TXqe0r7PUeNJaTk2NdY69LPxXh3sRfbmXibA8a7IudI8uLfSOKrrw6+tWDUWMz4vHfb4ETZx71wwhcBgIs5NPQJw4vlknm89kv+7aJBwjVRI9zoz9tX/TGqXSVo7C1yM3Ic788na74L2m8U6rGYUeGEAai1wbYVUqRi9hpMAhWImtKqHDFYGYI/EYoE3Rco5bpM4xx1LT/tqdu44CpPNbkzWcJF+2yxroyY/ze/mL63YwJxOCtQwXSICkawbHtmS+m9EOGjskWQ0nKIb/mpFBEhIxYJl6wTUrYvzmK/nIvO9O27b+GGk6NgFXzkY+OKoMMIL721KkKMQTH2fDPh9/GB69NVkE2olbtqL0lfxEJQ5uzdQX1LsfjM/P2qRHdrGh9oQ2PYiRDoG04R9TC4rlLNlmNUb365A+5q62WH5A=
+    file_glob: true
+    file: bridgr-*
+    cleanup: false
+    overwrite: true

Makefile

@@ -3,16 +3,18 @@ PKG := "$(PROJECT_NAME)"
 CMD := cmd/bridgr/main.go
 VERSION := $(shell  git describe --always --dirty | sed 's/^v//')
 GO_FILES := $(shell find . -name '*.go' | grep -v _test.go)
+OS := $(shell go env GOOS)
+ARCH := $(shell go env GOARCH)
 
 .SUFFIXES:
 .PHONY: all coverage lint test race x2unit xunit clean generate download locallint cilint
 
-ifeq ($(GOOS), linux)
-PROJECT_NAME := $(PROJECT_NAME)-Linux
-else ifeq ($(GOOS), windows)
-PROJECT_NAME := $(PROJECT_NAME)-Windows
-else ifeq ($(GOOS), darwin)
-PROJECT_NAME := $(PROJECT_NAME)-MacOS
+ifeq ($(OS), linux)
+PROJECT_NAME := $(PROJECT_NAME)-Linux-$(ARCH)
+else ifeq ($(OS), windows)
+PROJECT_NAME := $(PROJECT_NAME)-Windows-$(ARCH)
+else ifeq ($(OS), darwin)
+PROJECT_NAME := $(PROJECT_NAME)-MacOS-$(ARCH)
 endif
 
 all: $(PROJECT_NAME) $(PROJECT_NAME).sha256
@@ -29,7 +31,7 @@ locallint:
 	@golangci-lint run
 
 cilint:
-	@golangci-lint run --out-format=code-climate  --issues-exit-code=0 --new-from-rev=HEAD~1 > code-quality-report.json
+	@golangci-lint run -v --out-format=code-climate --new-from-rev=master --issues-exit-code=0 > code-quality-report.json
 
 test:
 	@go test -short ./...

go.mod

@@ -2,7 +2,7 @@ module github.com/aztechian/bridgr
 
 require (
 	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
-	github.com/aws/aws-sdk-go v1.32.6
+	github.com/aws/aws-sdk-go v1.32.9
 	github.com/davecgh/go-spew v1.1.1
 	github.com/docker/distribution v2.7.1+incompatible
 	github.com/docker/docker v1.13.1

go.sum

@@ -56,6 +56,8 @@ github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:o
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.32.6 h1:HoswAabUWgnrUF7X/9dr4WRgrr8DyscxXvTDm7Qw/5c=
 github.com/aws/aws-sdk-go v1.32.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/aws/aws-sdk-go v1.32.9 h1:ai+NZsCV+Z97+jqIKya49gbCObOay9FKww0/VCNuXug=
+github.com/aws/aws-sdk-go v1.32.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
 github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=