diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5ac863b890861a98141a3b0b263e386c7f5b7be7..9d122c555eab634a67253d39303e4f758801e567 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -38,6 +38,13 @@ jobs:
at: .
- run: make test_integration
+ build:
+ <<: *defaults
+ steps:
+ - attach_workspace:
+ at: .
+ - run: make build
+
release:
<<: *defaults
steps:
@@ -59,10 +66,10 @@ workflows:
test_and_release:
jobs:
- checkout_code:
- # Rather annoyingly we need this boilerplate on all transitive
+ # Rather annoyingly we need to include tags_filters on all transitive
# dependencies if we want the deploy job to build against a version
# tag.
- # Also note jobs build against all branches by default
+ # In contract jobs build against all branches by default
filters:
<<: *tags_filters
- test:
@@ -77,16 +84,22 @@ workflows:
filters:
<<: *tags_filters
+ - build:
+ requires:
+ - checkout_code
+ filters:
+ <<: *tags_filters
+
- release:
requires:
- test
- test_integration
+ - build
filters:
+ # tags filters and branch filters are applied disjunctively, so we
+ # will still build tags not on develop (i.e. including tagged
+ # releases on master that we specifically want to build)
<<: *tags_filters
branches:
- # Although we seem to exclude the master branch below, since
- # matching on tags is independent we will still build tags that
- # happen to point to a commit on master
- # We push dev pre-release images for every commit on develop
only: develop
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a78b5febf846c4d6823bc4a8b07e9784de5a677..59ce4188ec8e94f34d15eec5c5b8050a3ee7ea27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
# burrow changelog
+## v0.17.1
+Minor tweaks to docker build file
+
## v0.17.0
This is a service release with some significant ethereum/solidity compatibility improvements and new logging features. It includes:
diff --git a/Dockerfile b/Dockerfile
index 033acdbb92b2a466c2261bebbd89331cdbdd2c8e..f4850d4866559b8a47d15588e818ff24e85a6569 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Monax <support@monax.io>
RUN apk add --no-cache --update git
RUN go get github.com/Masterminds/glide
-ENV REPO $GOPATH/src/github.com/hyperledger/burrow
+ARG REPO=$GOPATH/src/github.com/hyperledger/burrow
COPY . $REPO
WORKDIR $REPO
RUN glide install
@@ -17,13 +17,9 @@ RUN go build --ldflags '-extldflags "-static"' -o bin/burrow-client ./client/cmd
# This will be our base container image
FROM alpine:3.6
-# There does not appear to be a way to share environment variables between stages
-ENV REPO /go/src/github.com/hyperledger/burrow
-
ENV USER monax
ENV MONAX_PATH /home/$USER/.monax
RUN addgroup -g 101 -S $USER && adduser -S -D -u 1000 $USER $USER
-VOLUME $MONAX_PATH
WORKDIR $MONAX_PATH
USER $USER:$USER
diff --git a/Makefile b/Makefile
index 91b8dfc77c9d444fd19a8451e53cc025b19b8af4..260f0379c1e0c27e4b4d99b74e5502e329ec4244 100644
--- a/Makefile
+++ b/Makefile
@@ -121,7 +121,7 @@ build_race_client:
# test burrow
.PHONY: test
-test:
+test: check
@go test ${PACKAGES_NOVENDOR}
.PHONY: test_integration
diff --git a/client/cmd/burrow-client.go b/client/cmd/burrow-client.go
index 77f746a38f4cee038f141e265f1c9ebbeacb0857..bb67c6ef4e92843c6d52dc557f0c5afa6a4452a8 100644
--- a/client/cmd/burrow-client.go
+++ b/client/cmd/burrow-client.go
@@ -35,7 +35,7 @@ var BurrowClientCmd = &cobra.Command{
Made with <3 by Monax Industries.
Complete documentation is available at https://monax.io/docs
-` + "\nVERSION:\n " + version.VERSION,
+` + "\nVERSION:\n " + version.GetSemanticVersionString(),
Run: func(cmd *cobra.Command, args []string) { cmd.Help() },
}
diff --git a/cmd/burrow.go b/cmd/burrow.go
index a29f3e1fee9ace78eedd4f81eeed42f086834d3b..6fb484661b589a7a101064b972e1e30d0fad86dc 100644
--- a/cmd/burrow.go
+++ b/cmd/burrow.go
@@ -34,7 +34,7 @@ your needs.
Made with <3 by Monax Industries.
Complete documentation is available at https://monax.io/docs
-` + "\nVERSION:\n " + version.VERSION,
+` + "\nVERSION:\n " + version.GetSemanticVersionString(),
Run: func(cmd *cobra.Command, args []string) { cmd.Help() },
}
diff --git a/event/events_test.go b/event/events_test.go
index 9f373f46ee8d30a5c08cdd63a41e9d7c7f02fc95..b9305d79e6de5d72ff02f459fcdd88502eda9dec 100644
--- a/event/events_test.go
+++ b/event/events_test.go
@@ -53,7 +53,7 @@ func TestMultiplexedEvents(t *testing.T) {
mutex2.Unlock()
})
- time.Sleep(2 * mockInterval)
+ time.Sleep(4 * mockInterval)
err := emitter12.Unsubscribe("Sub12")
assert.NoError(t, err)
diff --git a/util/version/cmd/main.go b/util/version/cmd/main.go
index c5711e205dc6e67ac7c472afe3922e0d6714c892..3c7dd2ba5fc3a6a5069fa81f9d43c83511049390 100644
--- a/util/version/cmd/main.go
+++ b/util/version/cmd/main.go
@@ -22,5 +22,5 @@ import (
// Print the Burrow version
func main() {
- fmt.Println(version.VERSION)
+ fmt.Println(version.GetSemanticVersionString())
}
diff --git a/version/version.go b/version/version.go
index b92218bb3ac749a50cbdf4601a4455c61f0955bb..0ae7136c5103c6f24fddd349c651a4988d4624d7 100644
--- a/version/version.go
+++ b/version/version.go
@@ -32,7 +32,7 @@ const (
// Minor version component of the current release
versionMinor = 17
// Patch version component of the current release
- versionPatch = 0
+ versionPatch = 1
)
var burrowVersion *VersionIdentifier
@@ -92,6 +92,13 @@ func (v *VersionIdentifier) GetMinorVersionString() string {
v.MinorVersion)
}
+// Return the plain version string without the ClientIdentifier
+func GetSemanticVersionString() string { return burrowVersion.GetSemanticVersionString() }
+func (v *VersionIdentifier) GetSemanticVersionString() string {
+ return fmt.Sprintf("%d.%d.%d", v.MajorVersion,
+ v.MinorVersion, v.PatchVersion)
+}
+
// note: similar remark applies here on the use of `int` over `uint8`
// for the arguments as above for MakeVersionString()
func MakeMinorVersionString(client string, major, minor, patch int) string {
@@ -125,8 +132,3 @@ func (version *VersionIdentifier) MatchesMinorVersion(
version.MajorVersion == referenceMajor &&
version.MinorVersion == referenceMinor
}
-
-//------------------------------------------------------------------------------
-// util/version/cmd prints this when run and is used to by build_tool.sh to obtain
-// Burrow version
-const VERSION = "0.17.0"