Add go.mod support with v4 (#107)

* Add go.mod support with v4 * updated helpers * unused dot files
gobuffalo · Jan 16, 2020 · eec9e0f · eec9e0f
1 parent c88d415
commit eec9e0f
Show file tree

Hide file tree

Showing 33 changed files with 166 additions and 348 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: markbates
+patreon: buffalo
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -0,0 +1,22 @@
+name: Tests
+on: [push]
+jobs:
+
+  tests-on:
+    name: ${{matrix.go-version}} ${{matrix.os}}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go-version: [1.12.x, 1.13.x]
+        os: [macos-latest, windows-latest, ubuntu-latest]
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+    - name: Test
+      run: |
+        go mod tidy -v
+        go test -race ./...
+
+
diff --git a/.gitignore b/.gitignore
@@ -27,4 +27,4 @@ generated/
 bin/*
 gin-bin
 .idea/
-go.*
+cover.out
diff --git a/.gometalinter.json b/.gometalinter.json
diff --git a/.goreleaser.yml b/.goreleaser.yml
diff --git a/.goreleaser.yml.plush b/.goreleaser.yml.plush
diff --git a/LICENSE.txt → LICENSE b/LICENSE.txt → LICENSE
diff --git a/Makefile b/Makefile
@@ -1,46 +1,8 @@
-TAGS ?= "sqlite"
-GO_BIN ?= go
-
-install:
-	packr2
-	$(GO_BIN) install -v ./plush
-
-deps:
-	$(GO_BIN) get github.com/gobuffalo/release
-	$(GO_BIN) get github.com/gobuffalo/packr/v2/packr2
-	$(GO_BIN) get -tags ${TAGS} -t ./...
-ifeq ($(GO111MODULE),on)
-	$(GO_BIN) mod tidy
-endif
-
-build:
-	packr2
-	$(GO_BIN) build -v .
-
 test:
-	packr2
-	$(GO_BIN) test -cover -tags ${TAGS} ./...
-
-ci-test:
-	$(GO_BIN) test -tags ${TAGS} -race ./...
-
-lint:
-	gometalinter --vendor ./... --deadline=1m --skip=internal
-
-update:
-	$(GO_BIN) get -u -tags ${TAGS}
-ifeq ($(GO111MODULE),on)
-	$(GO_BIN) mod tidy
-endif
-	packr2
-	make test
-	make install
-ifeq ($(GO111MODULE),on)
-	$(GO_BIN) mod tidy
-endif
-
-release-test:
-	$(GO_BIN) test -tags ${TAGS} -race ./...
+	go test -failfast -short -cover ./...
+	go mod tidy -v
 
-release:
-	release -y -f version.go
+cov:
+	go test -short -coverprofile cover.out ./...
+	go tool cover -html cover.out
+	go mod tidy -v
diff --git a/ast/ast.go b/ast/ast.go
@@ -1,6 +1,6 @@
 package ast
 
-import "github.com/gobuffalo/plush/token"
+import "github.com/gobuffalo/plush/v4/token"
 
 type TokenAble struct {
 	token.Token

diff --git a/ast/ast_test.go b/ast/ast_test.go
@@ -3,7 +3,7 @@ package ast
 import (
 	"testing"
 
-	"github.com/gobuffalo/plush/token"
+	"github.com/gobuffalo/plush/v4/token"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/ast/return_statement.go b/ast/return_statement.go
@@ -3,7 +3,7 @@ package ast
 import (
 	"bytes"
 
-	"github.com/gobuffalo/plush/token"
+	"github.com/gobuffalo/plush/v4/token"
 )
 
 type ReturnStatement struct {

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/azure-tests.yml b/azure-tests.yml
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,4 +27,4 @@ generated/ @@
     bin/*
     gin-bin
     .idea/
-    go.*
+    cover.out