diff options
| author | Rui Chen <chenrui333@gmail.com> | 2020-03-03 18:14:49 -0500 |
|---|---|---|
| committer | Rui Chen <chenrui333@gmail.com> | 2020-03-03 18:14:49 -0500 |
| commit | 395afc4a8dd99725916fd8834a58ae51d153caab (patch) | |
| tree | 8f12c1638cbf3f79c8ab4bac34ad44bff719ff4c | |
| parent | 31e201ca52a37cb75386931fe8f74911c0b1e528 (diff) | |
Bump golang to v1.14
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index c858c6a0c..5aff6284e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/golang:1.13 + - image: circleci/golang:1.14 environment: GO111MODULE: "on" working_directory: /go/src/github.com/jesseduffield/lazygit @@ -38,7 +38,7 @@ jobs: release: docker: - - image: circleci/golang:1.13 + - image: circleci/golang:1.14 working_directory: /go/src/github.com/jesseduffield/lazygit steps: - checkout diff --git a/Dockerfile b/Dockerfile index a85e4f20f..10ed10b2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,12 +2,12 @@ # docker build -t lazygit . # docker run -it lazygit:latest /bin/sh -l -FROM golang:1.13-alpine3.10 +FROM golang:1.14-alpine3.11 WORKDIR /go/src/github.com/jesseduffield/lazygit/ COPY ./ . RUN CGO_ENABLED=0 GOOS=linux go build -FROM alpine:3.10 +FROM alpine:3.11 RUN apk add -U git xdg-utils WORKDIR /go/src/github.com/jesseduffield/lazygit/ COPY --from=0 /go/src/github.com/jesseduffield/lazygit /go/src/github.com/jesseduffield/lazygit @@ -1,6 +1,6 @@ module github.com/jesseduffield/lazygit -go 1.13 +go 1.14 require ( github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 @@ -76,8 +76,6 @@ github.com/integrii/flaggy v1.4.0 h1:A1x7SYx4jqu5NSrY14z8Z+0UyX2S5ygfJJrfolWR3zM github.com/integrii/flaggy v1.4.0/go.mod h1:tnTxHeTJbah0gQ6/K0RW0J7fMUBk9MCF5blhm43LNpI= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= -github.com/jesseduffield/gocui v0.3.1-0.20200224201655-5024a02682ed h1:glGs+mzPZOl1iHiUsBW3918WeFwqsbQQ/jtLkkQXDi4= -github.com/jesseduffield/gocui v0.3.1-0.20200224201655-5024a02682ed/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw= github.com/jesseduffield/gocui v0.3.1-0.20200301081700-d6e485450113 h1:jHZRVJUWsU8HaQ0crocz0i0BkpOqFLDJEO/AtBp+Ecs= github.com/jesseduffield/gocui v0.3.1-0.20200301081700-d6e485450113/go.mod h1:2RtZznzYKt8RLRwvFiSkXjU0Ei8WwHdubgnlaYH47dw= github.com/jesseduffield/pty v1.2.1 h1:7xYBiwNH0PpWqC8JmvrPq1a/ksNqyCavzWu9pbBGYWI= |