Skip to content

Commit

Permalink
Merge pull request #6144 from ipfs/feat/go1.12
Browse files Browse the repository at this point in the history
Switch to Go 1.12
  • Loading branch information
Stebalien authored Apr 4, 2019
2 parents ade04d7 + 5d19b58 commit f47ed25
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ defaults: &defaults
TRAVIS: 1

docker:
- image: circleci/golang:1.11
- image: circleci/golang:1.12

jobs:
gotest:
Expand Down
15 changes: 13 additions & 2 deletions coverage/main/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,26 @@ func main() {
Pdeathsig: syscall.SIGTERM,
}

sig := make(chan os.Signal, 1)
sig := make(chan os.Signal, 10)
start := make(chan struct{})
go func() {
<-start
for {
p.Process.Signal(<-sig)
}
}()

signal.Notify(sig, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM)

err = p.Run()
err = p.Start()
if err != nil {
fmt.Println(err.Error())
os.Exit(1)
}

close(start)

err = p.Wait()
if err != nil {
fmt.Println(err.Error())
os.Exit(1)
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,5 @@ require (
gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
gotest.tools/gotestsum v0.3.3
)

go 1.12
2 changes: 1 addition & 1 deletion mk/golang.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# golang utilities
GO_MIN_VERSION = 1.11.4
GO_MIN_VERSION = 1.12
export GO111MODULE=on


Expand Down

0 comments on commit f47ed25

Please sign in to comment.