James Phillips
6a6eadd8c7
Adds open source side of network segments (feature is Enterprise-only).
2017-08-30 11:58:29 -07:00
Frank Schroeder
a11f3bb52b
build: drop 'consul' build tag for OSS build
2017-08-30 13:40:18 +02:00
James Phillips
9f6e7ec857
Revert "Rename GNUMakefile to Makefile ( #3348 )"
...
This reverts commit b0adb8af92de6bb1079a95e9ea28cadd4c0fcf06.
2017-08-03 09:50:04 -07:00
Seth Vargo
d5b7dd3d9f
Rename GNUMakefile to Makefile ( #3348 )
2017-08-02 10:46:03 -07:00
Frank Schroeder
828068810d
build: fix travis build
2017-07-18 09:24:40 +02:00
Frank Schroeder
94a09b4434
build: use vendorfmt to make vendor.json more merge friendly
2017-07-18 09:15:25 +02:00
Frank Schroeder
36e9ef4b1d
build: run vet on make test
2017-07-11 16:16:57 -07:00
Frank Schroeder
4ed443cfc4
build: build all packages together
...
Build all packages together with a global timeout. Locally,
the tests pass within 40 sec. On travis, we complete within
3-4 min.
travis truncates the logs after 4MB which we are hitting so
show the relevant information first and then whatever is left.
2017-07-07 09:22:34 +02:00
Maciej Stępyra
08c7ec1a59
Missing tools in makefile ( #3205 )
2017-06-29 12:55:01 +02:00
Preetha Appan
edcacf633b
fix type in make file
2017-06-28 09:48:00 -05:00
preetapan
e0759ecafc
make test should fail fast on test compilation errors ( #3172 )
2017-06-21 14:47:08 -07:00
James Phillips
d2251018d9
Fixes checked in web assets and associated build scripts. ( #3173 )
2017-06-21 14:43:07 -07:00
Preetha Appan
ea1f301661
Fixed static asset build target and checked in new executable for assetfs
2017-06-12 12:57:02 -05:00
Frank Schroeder
cd837b0b18
pkg refactor
...
command/agent/* -> agent/*
command/consul/* -> agent/consul/*
command/agent/command{,_test}.go -> command/agent{,_test}.go
command/base/command.go -> command/base.go
command/base/* -> command/*
commands.go -> command/commands.go
The script which did the refactor is:
(
cd $GOPATH/src/github.com/hashicorp/consul
git mv command/agent/command.go command/agent.go
git mv command/agent/command_test.go command/agent_test.go
git mv command/agent/flag_slice_value{,_test}.go command/
git mv command/agent .
git mv command/base/command.go command/base.go
git mv command/base/config_util{,_test}.go command/
git mv commands.go command/
git mv consul agent
rmdir command/base/
gsed -i -e 's|package agent|package command|' command/agent{,_test}.go
gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go
gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go
gsed -i -e 's|package main|package command|' command/commands.go
gsed -i -e 's|base.Command|BaseCommand|' command/commands.go
gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go
gsed -i -e 's|base\.||' command/commands.go
gsed -i -e 's|command\.||' command/commands.go
gsed -i -e 's|command|c|' main.go
gsed -i -e 's|range Commands|range command.Commands|' main.go
gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go
gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go
gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go
gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go
gsed -i -e 's|base.Command|BaseCommand|' command/*.go
gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go
gsed -i -e 's|base\.||' command/*_test.go
gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go
gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go
gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go
gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go
gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go
gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go
gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go
gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go
gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go
gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go
gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go
gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go
gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go
gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go
gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go
gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go
gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile
gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go
# fix imports
f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f
goimports -w $f
f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f
goimports -w $f
goimports -w command/*.go main.go
)
2017-06-10 18:52:45 +02:00
James Phillips
c83e465d90
Makes test target fail based on return code from go test.
2017-06-02 15:09:07 -07:00
Frank Schroeder
eac0f59d78
Revert "test: run all tests together again"
...
This reverts commit e48df7b57272f1075175d5bcd44746ec6eb8ca02.
2017-06-02 07:52:21 +02:00
Frank Schroeder
2f1947c862
test: run all tests together again
...
Looks like I have eliminated the troublesome tests for now.
2017-05-31 10:00:10 +02:00
Frank Schroeder
946428134e
build: update makefile
...
* capture all output to test.log only and print only failures
* always print output on travis
* test github.com/hashicorp/consul/consul separately until we've
found the interactions with the other packages during testing.
2017-05-31 00:29:28 +02:00
Frank Schroeder
96cdf3b9ae
build: add target for running tests with race detector
2017-05-31 00:29:25 +02:00
Frank Schroeder
5f1bd2aec0
test: capture stderr in test.log
2017-05-31 00:29:18 +02:00
Frank Schroeder
1f0a7511b0
test: simplify makefile
2017-05-12 22:12:47 +02:00
Frank Schroeder
cbb963b2eb
Add make target for linux binary
2017-05-04 13:31:56 +02:00
James Phillips
27188e5ec1
Merge pull request #2987 from sean-/b-fix-dev-paths
...
Fix `make dev` when the `bin/` directory doesn't exist.
2017-04-28 16:44:25 -07:00
Sean Chittenden
17ded857c7
Fix make dev when the bin/ directory doesn't exist.
...
Without this patch you end up with a nifty consul build named `bin`,
not `bin/consul`.
2017-04-28 16:40:50 -07:00
Frank Schroeder
03e4644581
build: Use bash for building
2017-04-27 11:49:43 -07:00
Frank Schroeder
d60546e69d
build: Do not swallow go test exit code
2017-04-27 11:17:58 -07:00
Frank Schroeder
7227ee21c3
build: Simplify make test and log output
2017-04-27 10:34:30 -07:00
Frank Schröder
d4ee438cd7
Faster dev builds ( #2924 )
...
This patch runs 'go install' instead of gox which runs 'go build' for
'make dev' and copies the binary into ./bin and ./pkg/${GOOS}_${GOARCH}
to mimick the previous behavior. This reduces the roundtrip times
for a dev build from 11 sec to 500ms if there weren't any changes.
2017-04-18 15:03:51 -07:00
Seth Vargo
a9dd63ae93
Modernize makefile a bit
2017-03-23 20:29:32 -04:00
Sean Chittenden
5030aa5459
Revert 97904cec95f1a1fafd18405f0dd143eb63d595a9
2017-02-01 16:32:30 -08:00
Sean Chittenden
2b460466ed
Catch cross-compiliation build failures at Travis.
2017-02-01 10:22:27 -08:00
James Phillips
e01fde4007
Runs the static asset packaging inside the container; updates assets.
2016-11-08 15:14:08 -08:00
James Phillips
117a7a365e
Makes vendor pattern more generic.
2016-11-02 17:33:56 -07:00
James Phillips
9003454f88
Adds basic build tag support with different versions. ( #2463 )
2016-11-02 17:27:49 -07:00
James Phillips
e5210166e2
Adds a UI build in a Docker container. ( #2462 )
2016-11-02 15:53:02 -07:00
James Phillips
44f7ebce05
Only builds the binary stuff under master branch CI.
2016-10-25 13:49:57 -07:00
Sean Chittenden
888bfa71c7
Add tools/cmd/cover to GOTOOLS
2016-05-07 13:02:12 -07:00
Sean Chittenden
79701fbf6d
golang.org/x/tools/cmd/vet is obsolete after Go1.5
...
`go tool vet` is builtin starting with Go 1.5
2016-05-07 13:01:07 -07:00
James Phillips
9ccfb68bce
Tweaks some of the default makefile targets.
2016-02-17 20:36:48 -08:00
James Phillips
7ec96d2468
Removes from cruft from the makefile.
2016-02-17 20:30:06 -08:00
James Phillips
d1925a3fe1
Makes vet check more sure fire now that it's xargs-ed.
2016-02-17 16:02:42 -08:00
Sean Chittenden
3ebd78013c
Don't run go vet on vendor/
2016-02-12 18:52:40 -08:00
Sean Chittenden
8ae9e06e8d
Add a tools target that fetches various build-time tools
2016-02-12 17:09:18 -08:00
Sean Chittenden
333ff22e9a
Manage dependencies via Godep
...
Embrace the future and use Go 1.6's vendor support via Godep.
Go 1.5 users should `export GO15VENDOREXPERIMENT=1`
2016-02-12 16:50:37 -08:00
Sean Chittenden
c0046e0f30
Acknowledge that we're using GNU make's dialect and rename appropriate
...
Makefiles to GNUmakefiles so that non-GNU make(1) will error out. This
should be a transparent change to the universe of people using GNU make.
2016-02-05 14:24:26 -08:00
