Merge pull request #20 from jattento/feature/check-no-changes-after-make

check make repo changes

Author: jattento

.ci/gofmt.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+BASEDIR=$(dirname "$0")
+
+go_fmt() {
+    format=$(go fmt ./...)
+    if [[ ${format} ]]; then
+        echo "go fmt failed:"
+        echo "${format}"
+        exit 1
+    else
+        echo "go fmt passed in"
+    fi
+}
+
+main() {
+    cd ${BASEDIR}/..
+
+    go_fmt
+}
+
+main "$@"

.ci/make.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+git_status_output=`git status`
+
+make -f Makefile || exit
+
+git_status_output_after=`git status`
+
+if [[ "$git_status_output" != "$git_status_output_after" ]]; then
+   echo ERROR: make command modified code
+   echo "$git_status_output"
+   echo "$git_status_output_after"
+    exit 1
+fi
+

.travis.yml

@@ -1,15 +1,23 @@
 language: go
 
 go:
+  - 1.15.x
   - 1.14.x
+  - 1.13.x
+
+install: true
+
+services:
+  - docker
 
 before_install:
   - go get -t -v ./...
   - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0
 
 script:
   - go test ./... -race -coverprofile=coverage.txt -covermode=atomic
-  - make
+  - bash .ci/make.sh
+  - bash .ci/gofmt.sh
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

Makefile

@@ -1,7 +1,7 @@
 ### Required tools
-GOTOOLS_CHECK = golangci-lint
+GOTOOLS_CHECK = go golangci-lint
 
-all: fmt ensure-deps linter test
+all: ensure-deps linter test
 
 ### Testing
 test:
@@ -14,10 +14,6 @@ test-cover:
 test-integration:
 	go test -tags integration ./... -covermode=atomic -coverpkg=./... -count=1 -race
 
-### Formatting, linting, and deps
-fmt:
-	go fmt ./...
-
 ensure-deps:
 	@echo "==> Running go mod tidy"
 	go mod download
@@ -30,4 +26,4 @@ linter:
 # To avoid unintended conflicts with file names, always add to .PHONY
 # unless there is a reason not to.
 # https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html
-.PHONY: check_tools test test-cover fmt linter ensure-deps
+.PHONY: all check_tools test test-cover linter ensure-deps

README.md

@@ -1,6 +1,10 @@
 [![codecov](https://codecov.io/gh/jattento/go-iso8583/branch/master/graph/badge.svg)](https://codecov.io/gh/jattento/go-iso8583)
-[![Build Status](https://travis-ci.com/jattento/go-iso8583.svg?branch=master)](https://travis-ci.com/jattento/go-iso8583)
 
+| Version   |      Build      |
+|----------|:-------------:|
+| Go 1.15 |[![Build Status](https://travis-ci.com/jattento/go-iso8583.svg?branch=master)](https://travis-ci.com/jattento/go-iso8583)|
+| Go 1.14 |[![Build Status](https://travis-ci.com/jattento/go-iso8583.svg?branch=master)](https://travis-ci.com/jattento/go-iso8583)|
+| Go 1.13 |[![Build Status](https://travis-ci.com/jattento/go-iso8583.svg?branch=master)](https://travis-ci.com/jattento/go-iso8583)|
 # go-iso8583
 
 An easy to use, yet flexible marshaler for ISO-8583.