Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-workhorse
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-workhorse
Commits
55e48636
Commit
55e48636
authored
Mar 01, 2017
by
Jacob Vosmaer (GitLab)
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'gofmt-skip-vendor' into 'master'
Don't assume /vendor passes gofmt Closes #108 See merge request !132
parents
6e29dae2
e0c47ef6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
Makefile
Makefile
+4
-3
No files found.
Makefile
View file @
55e48636
...
@@ -5,6 +5,7 @@ export GOPATH=${BUILD_DIR}/_build
...
@@ -5,6 +5,7 @@ export GOPATH=${BUILD_DIR}/_build
export
GO15VENDOREXPERIMENT
=
1
export
GO15VENDOREXPERIMENT
=
1
GOBUILD
=
go build
-ldflags
"-X main.Version=
${VERSION}
"
GOBUILD
=
go build
-ldflags
"-X main.Version=
${VERSION}
"
PKG
=
gitlab.com/gitlab-org/gitlab-workhorse
PKG
=
gitlab.com/gitlab-org/gitlab-workhorse
PKG_ALL
=
$(
shell
GOPATH
=
${GOPATH}
go list
${PKG}
/... |
grep
-v
/vendor/
)
all
:
clean-build gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse
all
:
clean-build gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse
...
@@ -28,8 +29,8 @@ ${BUILD_DIR}/_build:
...
@@ -28,8 +29,8 @@ ${BUILD_DIR}/_build:
.PHONY
:
test
.PHONY
:
test
test
:
clean-build clean-workhorse all
test
:
clean-build clean-workhorse all
go
fmt
${PKG
}
/...
|
awk
'{ print } END { if (NR > 0) { print "Please run go fmt"; exit 1 } }'
go
fmt
${PKG
_ALL}
|
awk
'{ print } END { if (NR > 0) { print "Please run go fmt"; exit 1 } }'
go
test
${PKG
}
/...
go
test
${PKG
_ALL}
@
echo
SUCCESS
@
echo
SUCCESS
coverage
:
coverage
:
...
@@ -38,7 +39,7 @@ coverage:
...
@@ -38,7 +39,7 @@ coverage:
rm
-f
test.coverage
rm
-f
test.coverage
fmt
:
fmt
:
go
fmt
./...
go
fmt
${PKG_ALL}
.PHONY
:
clean
.PHONY
:
clean
clean
:
clean-workhorse clean-build
clean
:
clean-workhorse clean-build
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment