Skip to content

Commit

Permalink
Merge branch 'master' into support-github-enterprise
Browse files Browse the repository at this point in the history
  • Loading branch information
senorprogrammer authored Jun 20, 2018
2 parents 39b6607 + ce072c1 commit 55533d1
Show file tree
Hide file tree
Showing 188 changed files with 25,875 additions and 1,353 deletions.
209 changes: 209 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
{
"projectName": "wtf",
"projectOwner": "senorprogrammer",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"imageSize": 48,
"commit": true,
"contributors": [
{
"login": "senorprogrammer",
"name": "Chris Cummer",
"avatar_url": "https://avatars0.githubusercontent.com/u/6413?v=4",
"profile": "https://twitter.com/senorprogrammer",
"contributions": []
},
{
"login": "jeangovil",
"name": "Hossein Mehrabi",
"avatar_url": "https://avatars1.githubusercontent.com/u/34973359?v=4",
"profile": "https://github.com/jeangovil",
"contributions": []
},
{
"login": "Fengyalv",
"name": "FengYa",
"avatar_url": "https://avatars0.githubusercontent.com/u/11779018?v=4",
"profile": "https://github.com/Fengyalv",
"contributions": []
},
{
"login": "deltaxflux",
"name": "deltax",
"avatar_url": "https://avatars2.githubusercontent.com/u/17337753?v=4",
"profile": "https://fluxionnetwork.github.io/fluxion/",
"contributions": []
},
{
"login": "BillKeenan",
"name": "Bill Keenan",
"avatar_url": "https://avatars0.githubusercontent.com/u/1319630?v=4",
"profile": "https://github.com/BillKeenan",
"contributions": []
},
{
"login": "interlock",
"name": "June S",
"avatar_url": "https://avatars2.githubusercontent.com/u/118081?v=4",
"profile": "http://blog.sapara.com",
"contributions": []
},
{
"login": "XanthusL",
"name": "liyiheng",
"avatar_url": "https://avatars3.githubusercontent.com/u/16461061?v=4",
"profile": "https://github.com/XanthusL",
"contributions": []
},
{
"login": "baustinanki",
"name": "baustinanki",
"avatar_url": "https://avatars2.githubusercontent.com/u/9014288?v=4",
"profile": "https://github.com/baustinanki",
"contributions": []
},
{
"login": "lixin9311",
"name": "lucus lee",
"avatar_url": "https://avatars0.githubusercontent.com/u/371475?v=4",
"profile": "https://github.com/lixin9311",
"contributions": []
},
{
"login": "mxplusb",
"name": "Mike Lloyd",
"avatar_url": "https://avatars1.githubusercontent.com/u/7537841?v=4",
"profile": "https://github.com/mxplusb",
"contributions": []
},
{
"login": "rubiojr",
"name": "Sergio Rubio",
"avatar_url": "https://avatars3.githubusercontent.com/u/10998?v=4",
"profile": "http://rubiojr.rbel.co",
"contributions": []
},
{
"login": "FarhadF",
"name": "Farhad Farahi",
"avatar_url": "https://avatars3.githubusercontent.com/u/17374492?v=4",
"profile": "https://github.com/FarhadF",
"contributions": []
},
{
"login": "lasanthak",
"name": "Lasantha Kularatne",
"avatar_url": "https://avatars1.githubusercontent.com/u/634604?v=4",
"profile": "http://lasantha.blogspot.com/",
"contributions": []
},
{
"login": "dlom",
"name": "Mark Old",
"avatar_url": "https://avatars1.githubusercontent.com/u/823331?v=4",
"profile": "https://github.com/dlom",
"contributions": []
},
{
"login": "flw-cn",
"name": "flw",
"avatar_url": "https://avatars0.githubusercontent.com/u/5546718?v=4",
"profile": "http://flw.tools/",
"contributions": []
},
{
"login": "davebarda",
"name": "David Barda",
"avatar_url": "https://avatars0.githubusercontent.com/u/6024927?v=4",
"profile": "https://github.com/davebarda",
"contributions": []
},
{
"login": "matrinox",
"name": "Geoff Lee",
"avatar_url": "https://avatars2.githubusercontent.com/u/4261980?v=4",
"profile": "https://github.com/matrinox",
"contributions": []
},
{
"login": "International",
"name": "George Opritescu",
"avatar_url": "https://avatars3.githubusercontent.com/u/1022918?v=4",
"profile": "http://international.github.io",
"contributions": []
},
{
"login": "Grazfather",
"name": "Grazfather",
"avatar_url": "https://avatars3.githubusercontent.com/u/497310?v=4",
"profile": "https://twitter.com/Grazfather",
"contributions": []
},
{
"login": "mcordell",
"name": "Michael Cordell",
"avatar_url": "https://avatars2.githubusercontent.com/u/1691120?v=4",
"profile": "http://www.mikecordell.com/",
"contributions": []
},
{
"login": "patrickelectric",
"name": "Patrick José Pereira",
"avatar_url": "https://avatars2.githubusercontent.com/u/1215497?v=4",
"profile": "http://patrick.ibexcps.com",
"contributions": []
},
{
"login": "sherodtaylor",
"name": "sherod taylor",
"avatar_url": "https://avatars2.githubusercontent.com/u/1483092?v=4",
"profile": "https://github.com/sherodtaylor",
"contributions": []
},
{
"login": "askl56",
"name": "Andrew Scott",
"avatar_url": "https://avatars2.githubusercontent.com/u/3062663?v=4",
"profile": "http://cogentia.io",
"contributions": []
},
{
"login": "anandsudhir",
"name": "Anand Sudhir Prayaga",
"avatar_url": "https://avatars2.githubusercontent.com/u/3252403?v=4",
"profile": "https://github.com/anandsudhir",
"contributions": []
},
{
"login": "lsipii",
"name": "Lassi Piironen",
"avatar_url": "https://avatars1.githubusercontent.com/u/12018440?v=4",
"profile": "https://github.com/lsipii",
"contributions": []
},
{
"login": "BlackWebWolf",
"name": "BlackWebWolf",
"avatar_url": "https://avatars0.githubusercontent.com/u/14799210?v=4",
"profile": "https://github.com/BlackWebWolf",
"contributions": []
},
{
"login": "andrewzolotukhin",
"name": "andrewzolotukhin",
"avatar_url": "https://avatars0.githubusercontent.com/u/1894885?v=4",
"profile": "https://github.com/andrewzolotukhin",
"contributions": []
},
{
"login": "retgits",
"name": "Leon Stigter",
"avatar_url": "https://avatars1.githubusercontent.com/u/8568280?v=4",
"profile": "https://retgits.github.io",
"contributions": []
}
]
}
35 changes: 24 additions & 11 deletions Gopkg.lock

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

4 changes: 4 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@
name = "gopkg.in/yaml.v2"
version = "2.2.1"

[[constraint]]
branch = "master"
name = "github.com/adlio/trello"

[prune]
go-tests = true
unused-packages = true
11 changes: 6 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
BRANCH := `git rev-parse --abbrev-ref HEAD`

.PHONY: dependencies install run
.PHONY: contrib_check dependencies install run

build:
go build -o bin/wtf

contrib_check:
npx all-contributors-cli check

install:
which wtf | xargs rm || true
go install -ldflags="-X main.version=$(shell git describe --always --abbrev=6)_$(BRANCH) -X main.date=$(shell date +%FT%T%z)"
go clean
go install -ldflags="-X main.version=$(shell git describe --always --abbrev=6) -X main.date=$(shell date +%FT%T%z)"
which wtf

run: build
Expand Down
Loading

0 comments on commit 55533d1

Please sign in to comment.