From 395afc4a8dd99725916fd8834a58ae51d153caab Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 3 Mar 2020 18:14:49 -0500 Subject: [PATCH 1/3] Bump golang to v1.14 --- .circleci/config.yml | 4 ++-- Dockerfile | 4 ++-- go.mod | 2 +- 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 diff --git a/go.mod b/go.mod index 8ed67a9bb..b3773a38b 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index ad01bd60c..492d25b95 100644 --- a/go.sum +++ b/go.sum @@ -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= From 0130fd36666ba6e8da67b3b700162f11435e77a4 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 3 Mar 2020 18:16:09 -0500 Subject: [PATCH 2/3] go mod vendor --- vendor/modules.txt | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/vendor/modules.txt b/vendor/modules.txt index 7cad1c0bc..fa5299f99 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,5 @@ # github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 +## explicit github.com/cloudfoundry/jibber_jabber # github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew/spew @@ -10,13 +11,21 @@ github.com/emirpasic/gods/trees github.com/emirpasic/gods/trees/binaryheap github.com/emirpasic/gods/utils # github.com/fatih/color v1.7.0 +## explicit github.com/fatih/color # github.com/fsnotify/fsnotify v1.4.7 +## explicit github.com/fsnotify/fsnotify # github.com/go-errors/errors v1.0.1 +## explicit github.com/go-errors/errors # github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3 +## explicit github.com/golang-collections/collections/stack +# github.com/golang/protobuf v1.3.2 +## explicit +# github.com/google/go-cmp v0.3.1 +## explicit # github.com/hashicorp/hcl v1.0.0 github.com/hashicorp/hcl github.com/hashicorp/hcl/hcl/ast @@ -29,61 +38,84 @@ github.com/hashicorp/hcl/json/parser github.com/hashicorp/hcl/json/scanner github.com/hashicorp/hcl/json/token # github.com/integrii/flaggy v1.4.0 +## explicit github.com/integrii/flaggy # github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 github.com/jbenet/go-context/io # github.com/jesseduffield/gocui v0.3.1-0.20200301081700-d6e485450113 +## explicit github.com/jesseduffield/gocui # github.com/jesseduffield/pty v1.2.1 +## explicit github.com/jesseduffield/pty # github.com/jesseduffield/termbox-go v0.0.0-20200130214842-1d31d1faa3c9 +## explicit github.com/jesseduffield/termbox-go # github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 +## explicit github.com/kardianos/osext # github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd github.com/kevinburke/ssh_config # github.com/konsorten/go-windows-terminal-sequences v1.0.2 +## explicit github.com/konsorten/go-windows-terminal-sequences # github.com/magiconair/properties v1.8.1 github.com/magiconair/properties # github.com/mattn/go-colorable v0.1.4 +## explicit github.com/mattn/go-colorable # github.com/mattn/go-isatty v0.0.11 +## explicit github.com/mattn/go-isatty # github.com/mattn/go-runewidth v0.0.8 +## explicit github.com/mattn/go-runewidth # github.com/mgutz/str v1.2.0 +## explicit github.com/mgutz/str # github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/go-homedir # github.com/mitchellh/mapstructure v1.1.2 github.com/mitchellh/mapstructure # github.com/nicksnyder/go-i18n/v2 v2.0.3 +## explicit github.com/nicksnyder/go-i18n/v2/i18n github.com/nicksnyder/go-i18n/v2/internal github.com/nicksnyder/go-i18n/v2/internal/plural +# github.com/onsi/ginkgo v1.10.3 +## explicit +# github.com/onsi/gomega v1.7.1 +## explicit # github.com/pelletier/go-toml v1.6.0 +## explicit github.com/pelletier/go-toml # github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib/difflib # github.com/sergi/go-diff v1.0.0 github.com/sergi/go-diff/diffmatchpatch # github.com/shibukawa/configdir v0.0.0-20170330084843-e180dbdc8da0 +## explicit github.com/shibukawa/configdir # github.com/sirupsen/logrus v1.4.2 +## explicit github.com/sirupsen/logrus # github.com/spf13/afero v1.2.2 +## explicit github.com/spf13/afero github.com/spf13/afero/mem # github.com/spf13/cast v1.3.0 github.com/spf13/cast # github.com/spf13/jwalterweatherman v1.1.0 +## explicit github.com/spf13/jwalterweatherman # github.com/spf13/pflag v1.0.5 +## explicit github.com/spf13/pflag # github.com/spf13/viper v1.6.1 +## explicit github.com/spf13/viper # github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad +## explicit github.com/spkg/bom # github.com/src-d/gcfg v1.4.0 github.com/src-d/gcfg @@ -91,14 +123,17 @@ github.com/src-d/gcfg/scanner github.com/src-d/gcfg/token github.com/src-d/gcfg/types # github.com/stretchr/testify v1.4.0 +## explicit github.com/stretchr/testify/assert # github.com/subosito/gotenv v1.2.0 github.com/subosito/gotenv # github.com/tcnksm/go-gitconfig v0.1.2 +## explicit github.com/tcnksm/go-gitconfig # github.com/xanzy/ssh-agent v0.2.1 github.com/xanzy/ssh-agent # golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 +## explicit golang.org/x/crypto/cast5 golang.org/x/crypto/chacha20 golang.org/x/crypto/curve25519 @@ -116,20 +151,25 @@ golang.org/x/crypto/ssh golang.org/x/crypto/ssh/agent golang.org/x/crypto/ssh/knownhosts # golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 +## explicit golang.org/x/net/context golang.org/x/net/internal/socks golang.org/x/net/proxy # golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 +## explicit golang.org/x/sys/cpu golang.org/x/sys/unix golang.org/x/sys/windows # golang.org/x/text v0.3.2 +## explicit golang.org/x/text/internal/language golang.org/x/text/internal/language/compact golang.org/x/text/internal/tag golang.org/x/text/language golang.org/x/text/transform golang.org/x/text/unicode/norm +# gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 +## explicit # gopkg.in/ini.v1 v1.51.0 gopkg.in/ini.v1 # gopkg.in/src-d/go-billy.v4 v4.3.2 @@ -139,6 +179,7 @@ gopkg.in/src-d/go-billy.v4/helper/polyfill gopkg.in/src-d/go-billy.v4/osfs gopkg.in/src-d/go-billy.v4/util # gopkg.in/src-d/go-git.v4 v4.13.1 +## explicit gopkg.in/src-d/go-git.v4 gopkg.in/src-d/go-git.v4/config gopkg.in/src-d/go-git.v4/internal/revision @@ -183,4 +224,5 @@ gopkg.in/src-d/go-git.v4/utils/merkletrie/noder # gopkg.in/warnings.v0 v0.1.2 gopkg.in/warnings.v0 # gopkg.in/yaml.v2 v2.2.7 +## explicit gopkg.in/yaml.v2 From 3d57da71ebd7d76fbfe5f14fdfc0b71c865323c9 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Wed, 4 Mar 2020 10:32:07 -0500 Subject: [PATCH 3/3] Add gox to vendor list --- go.mod | 1 + go.sum | 6 ++++++ vendor/modules.txt | 2 ++ 3 files changed, 9 insertions(+) diff --git a/go.mod b/go.mod index b3773a38b..eca4a2d3e 100644 --- a/go.mod +++ b/go.mod @@ -20,6 +20,7 @@ require ( github.com/mattn/go-isatty v0.0.11 // indirect github.com/mattn/go-runewidth v0.0.8 github.com/mgutz/str v1.2.0 + github.com/mitchellh/gox v1.0.1 // indirect github.com/nicksnyder/go-i18n/v2 v2.0.3 github.com/onsi/ginkgo v1.10.3 // indirect github.com/onsi/gomega v1.7.1 // indirect diff --git a/go.sum b/go.sum index 492d25b95..b9db22d36 100644 --- a/go.sum +++ b/go.sum @@ -68,6 +68,8 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/hashicorp/go-version v1.0.0 h1:21MVWPKDphxa7ineQQTrCU5brh7OuVVAzGOCnnCPtE8= +github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= @@ -117,6 +119,10 @@ github.com/mgutz/str v1.2.0 h1:4IzWSdIz9qPQWLfKZ0rJcV0jcUDpxvP4JVZ4GXQyvSw= github.com/mgutz/str v1.2.0/go.mod h1:w1v0ofgLaJdoD0HpQ3fycxKD1WtxpjSo151pK/31q6w= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI= +github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4= +github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= diff --git a/vendor/modules.txt b/vendor/modules.txt index fa5299f99..26eaf67e5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -75,6 +75,8 @@ github.com/mattn/go-runewidth github.com/mgutz/str # github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/go-homedir +# github.com/mitchellh/gox v1.0.1 +## explicit # github.com/mitchellh/mapstructure v1.1.2 github.com/mitchellh/mapstructure # github.com/nicksnyder/go-i18n/v2 v2.0.3