summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim <wim@42.be>2019-11-17 23:16:06 +0100
committerGitHub <noreply@github.com>2019-11-17 23:16:06 +0100
commitaae45a8179aed415b592fe538cb714b625fd7379 (patch)
tree5614b144f19f5fb14228707cfa8de0a14ab9b397
parent075ca9ca471a7bfaf86fd0a762ed38b8cbf4edfb (diff)
downloadmatterbridge-msglm-aae45a8179aed415b592fe538cb714b625fd7379.tar.gz
matterbridge-msglm-aae45a8179aed415b592fe538cb714b625fd7379.tar.bz2
matterbridge-msglm-aae45a8179aed415b592fe538cb714b625fd7379.zip
Upgrade linter and travis to go1.13 (#949)
-rw-r--r--.golangci.yaml1
-rw-r--r--.travis.yml10
-rwxr-xr-xci/bintray.sh2
3 files changed, 7 insertions, 6 deletions
diff --git a/.golangci.yaml b/.golangci.yaml
index 82b2d750..f2f03600 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -174,6 +174,7 @@ linters:
- lll
- maligned
- prealloc
+ - wsl
# rules to deal with reported isues
diff --git a/.travis.yml b/.travis.yml
index 4814cd5d..4c80c1d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,22 +20,22 @@ jobs:
- stage: lint
# Run linting in one Go environment only.
script: ./ci/lint.sh
- go: 1.12.x
+ go: 1.13.x
env:
- GO111MODULE=on
- - GOLANGCI_VERSION="v1.17.1"
+ - GOLANGCI_VERSION="v1.21.0"
- stage: test
# Run tests in a combination of Go environments.
script: ./ci/test.sh
- go: 1.11.x
+ go: 1.12.x
env:
- GO111MODULE=off
- script: ./ci/test.sh
- go: 1.11.x
+ go: 1.12.x
env:
- GO111MODULE=on
- script: ./ci/test.sh
- go: 1.12.x
+ go: 1.13.x
env:
- GO111MODULE=on
- REPORT_COVERAGE=1
diff --git a/ci/bintray.sh b/ci/bintray.sh
index c7e8a81e..64013fab 100755
--- a/ci/bintray.sh
+++ b/ci/bintray.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -u -e -x -o pipefail
-go version | grep go1.12 || exit
+go version | grep go1.13 || exit
VERSION=$(git describe --tags)
mkdir ci/binaries