Skip to content

Commit

Permalink
New Project Layout (#152)
Browse files Browse the repository at this point in the history
New Project Layout
  • Loading branch information
moul committed Jan 15, 2020
2 parents d6e112d + dfcdc3b commit a0668cc
Show file tree
Hide file tree
Showing 10 changed files with 453 additions and 117 deletions.
17 changes: 17 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: 2.1

orbs:
moul: moul/build@1.14.0 # https://github.com/moul/build

workflows:
main:
jobs:
- moul/golang-build:
gopkg: moul.io/protoc-gen-gotemplate
- moul/golang-build:
gopkg: moul.io/protoc-gen-gotemplate
tag: '1.12'
- moul/golang-build:
gopkg: moul.io/protoc-gen-gotemplate
tag: '1.11'
- moul/docker-build
15 changes: 15 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Auto detect text files and perform LF normalization
* text=auto

# Collapse vendored and generated files on GitHub
vendor/* linguist-vendored
rules.mk linguist-vendored
*/vendor/* linguist-vendored
*.gen.* linguist-generated
*.pb.go linguist-generated
go.sum linguist-generated
go.mod linguist-generated
gen.sum linguist-generated

# Reduce conflicts on markdown files
*.md merge=union
43 changes: 20 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
vendor/**/.travis.yml
# Temporary files
*~
*#
.#*
coverage.txt

/protoc-gen-gotemplate
# Vendors
package-lock.json
node_modules/
vendor/

# Compiled Object files, Static and Dynamic libs (Shared Objects)
*.o
*.a
# Binaries for programs and plugins
dist/
gin-bin
*.exe
*.exe~
*.dll
*.so
*.dylib

# Folders
_obj
_test

# Architecture specific extensions/prefixes
*.[568vq]
[568vq].out

*.cgo1.go
*.cgo2.c
_cgo_defun.c
_cgo_gotypes.go
_cgo_export.*

_testmain.go

*.exe
# Test binary, build with `go test -c`
*.test
*.prof

# Output of the go coverage tool, specifically when used with LiteIDE
*.out
19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

28 changes: 28 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This file lists all individuals having contributed content to the repository.
# For how it is generated, see 'https://github.com/moul/rules.mk'

Alexandre Beslic <abeslic@abronan.com>
Anastasia DERUELLE <anastasia.deruelle@gmail.com>
Gero <geronimo@eclypsium.com>
gfanton <guilhem.fanton@gmail.com>
Guilhem Fanton <guilhem.fanton@gmail.com>
Jan Weitz <jan@iosphere.de>
jhayotte <julien.hayotte@gmail.com>
Julien Hayotte <julien.hayotte@gmail.com>
Manfred Touron <m@42.am>
Mathieu Acthernoene <zoontek@gmail.com>
Mike Lee <mike.lee@safeguardproperties.com>
moul-bot <41326314+moul-bot@users.noreply.github.com>
Pat Moroney <pat@pat.email>
Pat Moroney <pmoroney@name.com>
Peter Monko <piotrek.monko@gmail.com>
Pierre Roullon <pierre.roullon@gmail.com>
Quentin Perez <qperez@ocs.online.net>
Renovate Bot <bot@renovateapp.com>
Sacha Froment <sfroment42@gmail.com>
Shogo Iwano <shiwano@gmail.com>
Thomas KERAMBLOCH <tkerambloch@vente-privee.com>
Tommy PAGEARD <tpageard@vente-privee.com>
Valerio Gheri <valerio.gheri@gmail.com>
Victor Login <batazor111@gmail.com>
webii <michal.jaglewicz@gmail.com>
34 changes: 11 additions & 23 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.PHONY: build
build:
go build -v -i -o protoc-gen-gotemplate .
GOPKG ?= moul.io/protoc-gen-gotemplate
DOCKER_IMAGE ?= moul/golang-repo-template
GOBINS ?= . ./cmd/web-editor
GOLIBS ?= .

.PHONY: install
install:
go install .
go install ./cmd/web-editor
all: test install

.PHONY: test
test: install
include rules.mk

.PHONY: examples
examples: install
cd examples/time && make
cd examples/enum && make
cd examples/import && make
Expand All @@ -18,19 +18,7 @@ test: install
cd examples/flow && make
cd examples/sitemap && make
cd examples/go-generate && make
# cd examples/single-package-mode && make
#cd examples/single-package-mode && make
cd examples/helpers && make
cd examples/arithmetics && make
# cd examples/go-kit && make

.PHONY: docker.build
docker.build:
docker build --pull -t moul/protoc-gen-gotemplate .

.PHONY: docker.push
docker.push: docker.build
docker push moul/protoc-gen-gotemplate

.PHONY: lint
lint:
golangci-lint run --verbose . ./helpers ./cmd/...
#cd examples/go-kit && make
33 changes: 17 additions & 16 deletions go.mod

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

105 changes: 75 additions & 30 deletions go.sum

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

6 changes: 0 additions & 6 deletions renovate.json

This file was deleted.

0 comments on commit a0668cc

Please sign in to comment.