Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing #168 #169

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.git/
.idea/
.test/
*.iml
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.test
.go

.idea/
*.iml
13 changes: 6 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ script:
- go test -race -v ./...

go:
- 1.5
- 1.6
- 1.7
- 1.8
- 1.9
- 1.11
- 1.12
- 1.13
- 1.14
- stable
- tip

matrix:
allow_failures:
- go: tip

install:
- go get gopkg.in/fsnotify/fsnotify.v1
- go get gopkg.in/tomb.v1
6 changes: 6 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# API v1 (gopkg.in/hpcloud/tail.v1)

## March, 2020

* Migrated to go mod as fsnotify has moved away from gopkg.in
* Updated vendor folder so it works with go version <= 1.11
* Added extra Dockerfile to test building with go 1.9 as that is the lowest, working version now

## April, 2016

* Migrated to godep, as depman is not longer supported
Expand Down
12 changes: 5 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
FROM golang

RUN mkdir -p $GOPATH/src/github.com/hpcloud/tail/
ADD . $GOPATH/src/github.com/hpcloud/tail/

# expecting to fetch dependencies successfully.
RUN go get -v github.com/hpcloud/tail
ADD . /src/tail/
WORKDIR /src/tail

# expecting to run the test successfully.
RUN go test -v github.com/hpcloud/tail
RUN go test -race -v ./...

# expecting to install successfully
RUN go install -v github.com/hpcloud/tail
RUN go install -v github.com/hpcloud/tail/cmd/gotail
RUN go install -v .
RUN go install -v ./cmd/gotail

RUN $GOPATH/bin/gotail -h || true

Expand Down
19 changes: 19 additions & 0 deletions Dockerfile-go-1.9
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM golang:1.9

RUN mkdir -p $GOPATH/src/github.com/hpcloud/tail/
ADD . $GOPATH/src/github.com/hpcloud/tail/

# expecting to fetch dependencies successfully.
RUN go get -v github.com/hpcloud/tail

# expecting to run the test successfully.
RUN go test -race -v github.com/hpcloud/tail

# expecting to install successfully
RUN go install -v github.com/hpcloud/tail
RUN go install -v github.com/hpcloud/tail/cmd/gotail

RUN $GOPATH/bin/gotail -h || true

ENV PATH $GOPATH/bin:$PATH
CMD ["gotail"]
15 changes: 0 additions & 15 deletions Godeps/Godeps.json

This file was deleted.

5 changes: 0 additions & 5 deletions Godeps/Readme

This file was deleted.

8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ test: *.go
fmt:
gofmt -w .

mod:
go mod tidy

vendor:
go mod vendor
# Run the test in an isolated environment.
fulltest:
docker build -t hpcloud/tail -f Dockerfile-go-1.9 .
docker build -t hpcloud/tail .

all: fmt mod vendor test
9 changes: 9 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module github.com/hpcloud/tail

go 1.11

require (
github.com/fsnotify/fsnotify v1.4.9
golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0 // indirect
gopkg.in/tomb.v1 v1.0.0-20140529071818-c131134a1947
)
7 changes: 7 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0 h1:4Khi5GeNOkZS5DqSBRn4Sy7BE6GuxwOqARPqfurkdNk=
golang.org/x/sys v0.0.0-20200316230553-a7d97aace0b0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
gopkg.in/tomb.v1 v1.0.0-20140529071818-c131134a1947 h1:aNEcl02ps/eZaBJi2LycKl0jPsUryySSSgrCxieZRYA=
gopkg.in/tomb.v1 v1.0.0-20140529071818-c131134a1947/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
12 changes: 12 additions & 0 deletions vendor/github.com/fsnotify/fsnotify/.editorconfig

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/github.com/fsnotify/fsnotify/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions vendor/github.com/fsnotify/fsnotify/.travis.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading