Skip to content
Snippets Groups Projects
Commit 4db705ee authored by Casey Kuhlman's avatar Casey Kuhlman Committed by GitHub
Browse files

Merge pull request #651 from silasdavis/docker-tweaks

Ensure check and build included in pre-release CI jobs
parents 9cec3322 ebcf2f39
No related branches found
No related tags found
No related merge requests found
...@@ -38,6 +38,13 @@ jobs: ...@@ -38,6 +38,13 @@ jobs:
at: . at: .
- run: make test_integration - run: make test_integration
build:
<<: *defaults
steps:
- attach_workspace:
at: .
- run: make build
release: release:
<<: *defaults <<: *defaults
steps: steps:
...@@ -77,10 +84,17 @@ workflows: ...@@ -77,10 +84,17 @@ workflows:
filters: filters:
<<: *tags_filters <<: *tags_filters
- build:
requires:
- checkout_code
filters:
<<: *tags_filters
- release: - release:
requires: requires:
- test - test
- test_integration - test_integration
- build
filters: filters:
# tags filters and branch filters are applied disjunctively, so we # tags filters and branch filters are applied disjunctively, so we
# will still build tags not on develop (i.e. including tagged # will still build tags not on develop (i.e. including tagged
......
...@@ -121,7 +121,7 @@ build_race_client: ...@@ -121,7 +121,7 @@ build_race_client:
# test burrow # test burrow
.PHONY: test .PHONY: test
test: test: check
@go test ${PACKAGES_NOVENDOR} @go test ${PACKAGES_NOVENDOR}
.PHONY: test_integration .PHONY: test_integration
......
...@@ -93,7 +93,7 @@ func (v *VersionIdentifier) GetMinorVersionString() string { ...@@ -93,7 +93,7 @@ func (v *VersionIdentifier) GetMinorVersionString() string {
} }
// Return the plain version string without the ClientIdentifier // 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 { func (v *VersionIdentifier) GetSemanticVersionString() string {
return fmt.Sprintf("%d.%d.%d", v.MajorVersion, return fmt.Sprintf("%d.%d.%d", v.MajorVersion,
v.MinorVersion, v.PatchVersion) v.MinorVersion, v.PatchVersion)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment