From c707790c3481fcd14ab3357612fcbe66f94c4405 Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Mon, 20 Apr 2020 23:27:50 +0100 Subject: [PATCH 1/9] Fix the wercker build --- .gitignore | 3 +++ wercker.yml | 21 ++++++++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index f45607f..64c05b6 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,6 @@ lib/test_fixtures/build_success/build_success *.iml *.ipr *.iws + +# Wercker +.wercker \ No newline at end of file diff --git a/wercker.yml b/wercker.yml index 41d2c52..502f5b3 100644 --- a/wercker.yml +++ b/wercker.yml @@ -1 +1,20 @@ -box: wercker/golang +box: golang +build: + steps: + - wercker/setup-go-workspace: + package-dir: github.com/codegangsta/gin + + - script: + name: go get + code: | + go get + + - script: + name: go build + code: | + go build ./... + + - script: + name: go test + code: | + go test ./... From 5d3e890c30ee1f588800a6c4fff5e19f0923b11b Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Mon, 20 Apr 2020 23:29:53 +0100 Subject: [PATCH 2/9] Use wercker explicit build (breaks "wercker build") --- wercker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wercker.yml b/wercker.yml index 502f5b3..c0d5b62 100644 --- a/wercker.yml +++ b/wercker.yml @@ -1,4 +1,4 @@ -box: golang +box: wercker/golang build: steps: - wercker/setup-go-workspace: From 5902d7724bd174b667fb7b3c4a51c418dee520f0 Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Mon, 20 Apr 2020 23:34:25 +0100 Subject: [PATCH 3/9] Make go get verbose --- wercker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wercker.yml b/wercker.yml index c0d5b62..be076eb 100644 --- a/wercker.yml +++ b/wercker.yml @@ -7,7 +7,7 @@ build: - script: name: go get code: | - go get + go get -v - script: name: go build From f43b0b417825494e770e2b411d17b12805c632d4 Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Mon, 20 Apr 2020 23:39:04 +0100 Subject: [PATCH 4/9] Go get with update to fix md2man --- wercker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wercker.yml b/wercker.yml index be076eb..2c052e3 100644 --- a/wercker.yml +++ b/wercker.yml @@ -7,7 +7,7 @@ build: - script: name: go get code: | - go get -v + go get -v -u - script: name: go build From f80a4e349f4031729ab65c25bacd65f3380dd33e Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Mon, 20 Apr 2020 23:41:24 +0100 Subject: [PATCH 5/9] Explicitly get md2man --- wercker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wercker.yml b/wercker.yml index 2c052e3..70351a4 100644 --- a/wercker.yml +++ b/wercker.yml @@ -7,7 +7,8 @@ build: - script: name: go get code: | - go get -v -u + go get -v -u github.com/cpuguy83/go-md2man + go get -v - script: name: go build From 42578ee423dc607703c9261b7a9277347a3d44b3 Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Mon, 20 Apr 2020 23:43:52 +0100 Subject: [PATCH 6/9] Explicitly get urfave --- main.go | 2 +- wercker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 2da9b60..f2c7cbb 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ import ( "github.com/codegangsta/envy/lib" "github.com/codegangsta/gin/lib" shellwords "github.com/mattn/go-shellwords" - "gopkg.in/urfave/cli.v1" + "github.com/urfave/cli" "github.com/0xAX/notificator" "log" diff --git a/wercker.yml b/wercker.yml index 70351a4..1fad1d4 100644 --- a/wercker.yml +++ b/wercker.yml @@ -7,7 +7,7 @@ build: - script: name: go get code: | - go get -v -u github.com/cpuguy83/go-md2man + go get -v -u github.com/urfave/cli # Workaround for https://github.com/urfave/cli/pull/1056 go get -v - script: From 1cd03e7faa7c23c13a2de8557eeacb6518638c8f Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Tue, 21 Apr 2020 00:14:59 +0100 Subject: [PATCH 7/9] Add explicit go dependencies --- .gitignore | 2 ++ go.mod | 11 +++++++++++ go.sum | 21 +++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 go.mod create mode 100644 go.sum diff --git a/.gitignore b/.gitignore index 64c05b6..3b30ecd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ *.o *.a *.so +lib/build_success +gin # Folders _obj diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..ae23f34 --- /dev/null +++ b/go.mod @@ -0,0 +1,11 @@ +module github.com/codegangsta/gin + +go 1.14 + +require ( + github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1 + github.com/codegangsta/envy v0.0.0-20141216192214-4b78388c8ce4 + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/mattn/go-shellwords v1.0.10 + github.com/urfave/cli v1.22.4 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..ffcf064 --- /dev/null +++ b/go.sum @@ -0,0 +1,21 @@ +github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1 h1:j9HaafapDbPbGRDku6e/HRs6KBMcKHiWcm1/9Sbxnl4= +github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1/go.mod h1:NtXa9WwQsukMHZpjNakTTz0LArxvGYdPA9CjIcUSZ6s= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/codegangsta/envy v0.0.0-20141216192214-4b78388c8ce4 h1:ihrIKrLQzm6Q6NJHBMemvaIGTFxgxQUEkn2AjN0Aulw= +github.com/codegangsta/envy v0.0.0-20141216192214-4b78388c8ce4/go.mod h1:X7wHz0C25Lga6CnJ4WAQNbUQ9P/8eWSNv8qIO71YkSM= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= +github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/mattn/go-shellwords v1.0.10 h1:Y7Xqm8piKOO3v10Thp7Z36h4FYFjt5xB//6XvOrs2Gw= +github.com/mattn/go-shellwords v1.0.10/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA= +github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 763c608abbb04e34cba02db9acb4e910fb562e72 Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Tue, 21 Apr 2020 00:16:14 +0100 Subject: [PATCH 8/9] Use upstream golang --- wercker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wercker.yml b/wercker.yml index 1fad1d4..09d0245 100644 --- a/wercker.yml +++ b/wercker.yml @@ -1,4 +1,5 @@ -box: wercker/golang +box: + id: golang build: steps: - wercker/setup-go-workspace: @@ -7,7 +8,6 @@ build: - script: name: go get code: | - go get -v -u github.com/urfave/cli # Workaround for https://github.com/urfave/cli/pull/1056 go get -v - script: From 643349cc74ac1171b7a8e83e0776c908fd793ef5 Mon Sep 17 00:00:00 2001 From: Tom Parker-Shemilt Date: Tue, 21 Apr 2020 00:19:48 +0100 Subject: [PATCH 9/9] Reset back to classic wercker box --- wercker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wercker.yml b/wercker.yml index 09d0245..be076eb 100644 --- a/wercker.yml +++ b/wercker.yml @@ -1,5 +1,4 @@ -box: - id: golang +box: wercker/golang build: steps: - wercker/setup-go-workspace: