Skip to content

Commit bad7014

Browse files
committed
Drop support go1.10 and govendor
1 parent 0d612af commit bad7014

File tree

4 files changed

+15
-39
lines changed

4 files changed

+15
-39
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ language: go
33
matrix:
44
fast_finish: true
55
include:
6-
- go: 1.10.x
76
- go: 1.11.x
87
env: GO111MODULE=on
98
- go: 1.12.x
@@ -18,7 +17,7 @@ before_install:
1817
- if [[ "${GO111MODULE}" = "on" ]]; then mkdir "${HOME}/go"; export GOPATH="${HOME}/go"; fi
1918

2019
install:
21-
- if [[ "${GO111MODULE}" = "on" ]]; then go mod download; else make install; fi
20+
- if [[ "${GO111MODULE}" = "on" ]]; then go mod download; fi
2221
- if [[ "${GO111MODULE}" = "on" ]]; then export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"; fi
2322
- if [[ "${GO111MODULE}" = "on" ]]; then make tools; fi
2423

Makefile

+4-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
GO ?= go
22
GOFMT ?= gofmt "-s"
3-
PACKAGES ?= $(shell $(GO) list ./... | grep -v /vendor/)
4-
VETPACKAGES ?= $(shell $(GO) list ./... | grep -v /vendor/ | grep -v /examples/)
5-
GOFILES := $(shell find . -name "*.go" -type f -not -path "./vendor/*")
6-
TESTFOLDER := $(shell $(GO) list ./... | grep -v /vendor/ | grep -v examples)
7-
8-
all: install
9-
10-
install: deps
11-
govendor sync
3+
PACKAGES ?= $(shell $(GO) list ./...)
4+
VETPACKAGES ?= $(shell $(GO) list ./... | grep -v /examples/)
5+
GOFILES := $(shell find . -name "*.go")
6+
TESTFOLDER := $(shell $(GO) list ./... | grep -v examples)
127

138
.PHONY: test
149
test:
@@ -48,11 +43,6 @@ fmt-check:
4843
vet:
4944
$(GO) vet $(VETPACKAGES)
5045

51-
deps:
52-
@hash govendor > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
53-
$(GO) get -u github.com/kardianos/govendor; \
54-
fi
55-
5646
.PHONY: lint
5747
lint:
5848
@hash golint > /dev/null 2>&1; if [ $$? -ne 0 ]; then \

README.md

+10
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010
1111
Thanks to [path-to-regexp](https://github.com/pillarjs/path-to-regexp) which is the original version written in javascript.
1212

13+
## Installation
14+
15+
To install `Path-to-RegExp` package, you need to install Go and set your Go workspace first.
16+
17+
The first need [Go](https://golang.org/) installed (**version 1.11+ is required**), then you can use the below Go command to install `Path-to-RegExp`.
18+
19+
```sh
20+
$ go get -u github.com/soongo/path-to-regexp
21+
```
22+
1323
## Usage
1424

1525
```go

vendor/vendor.json

-23
This file was deleted.

0 commit comments

Comments
 (0)