From ebcf2f39fcfe83efc2a89806203d7dbcdeca03e6 Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Tue, 5 Sep 2017 14:20:58 +0100
Subject: [PATCH] ensure check and build included in pre-release CI jobs
---
.circleci/config.yml | 14 ++++++++++++++
Makefile | 2 +-
version/version.go | 2 +-
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 404baac9..9d122c55 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:
@@ -77,10 +84,17 @@ 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
diff --git a/Makefile b/Makefile
index 91b8dfc7..260f0379 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/version/version.go b/version/version.go
index 16283656..0ae7136c 100644
--- a/version/version.go
+++ b/version/version.go
@@ -93,7 +93,7 @@ func (v *VersionIdentifier) GetMinorVersionString() string {
}
// Return the plain version string without the ClientIdentifier
-func GetSemanticVersionString() string { return burrowVersion.GetSemanticVersionString() }
+func GetSemanticVersionString() string { return burrowVersion.GetSemanticVersionString() }
func (v *VersionIdentifier) GetSemanticVersionString() string {
return fmt.Sprintf("%d.%d.%d", v.MajorVersion,
v.MinorVersion, v.PatchVersion)
--
GitLab