Skip to content

Commit ef87cd1

Browse files
author
greg
committed
use burrow versioning
Signed-off-by: greg <[email protected]>
1 parent c3b309b commit ef87cd1

18 files changed

+524
-97
lines changed
File renamed without changes.

.circleci/config.yml

Lines changed: 66 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,93 @@ defaults: &defaults
33
docker:
44
- image: quay.io/monax/hoard:build
55

6+
tag_filters: &tags_filters
7+
tags:
8+
only: /^v[0-9]+\.[0-9]+\.[0-9]+$/
9+
610
setup_docker: &setup_docker
7-
version: 17.06.1-ce
11+
version: 17.11.0-ce
812

913
version: 2
1014
jobs:
11-
build:
15+
test:
16+
<<: *defaults
17+
steps:
18+
- run: echo $CIRCLE_PULL_REQUESTS
19+
- checkout
20+
- run: make test
21+
- run: make build
22+
23+
test_integration:
24+
<<: *defaults
25+
steps:
26+
- checkout
27+
- run: make test_integration
28+
29+
ensure_vendor:
30+
<<: *defaults
31+
steps:
32+
- checkout
33+
- run: make ensure_vendor
34+
35+
build_docker:
1236
<<: *defaults
1337
steps:
1438
- checkout
15-
- run: make build_ci
1639
- setup_remote_docker:
1740
<<: *setup_docker
18-
# Note: will only actually release images and binaries if we are on a version tag (enforced in script)
19-
- run: make release
41+
- run: make docker_build
2042

21-
integration_test:
43+
release_dev:
2244
<<: *defaults
2345
steps:
24-
- checkout
2546
- setup_remote_docker:
2647
<<: *setup_docker
27-
- run: make test_integration
48+
- checkout
49+
- run: make release_dev
2850

51+
release:
52+
<<: *defaults
53+
steps:
54+
- setup_remote_docker:
55+
<<: *setup_docker
56+
- checkout
57+
- run: make release
2958

3059

31-
# We are forced to use a workflow to trigger builds on tag pushes. Note that despite this being
32-
# an 'only' filter, it does not mean we only build on version tags.
33-
# all branch pushes and PRs are included by default, only tags need a specific filter
3460
workflows:
3561
version: 2
36-
build:
62+
test_and_release:
3763
jobs:
38-
- build:
64+
- test:
65+
filters:
66+
<<: *tags_filters
67+
68+
- test_integration:
69+
filters:
70+
<<: *tags_filters
71+
72+
- ensure_vendor:
73+
filters:
74+
<<: *tags_filters
75+
76+
- build_docker:
77+
filters:
78+
<<: *tags_filters
79+
80+
- release_dev:
81+
requires:
82+
- test
83+
- test_integration
3984
filters:
40-
tags:
41-
only: /^v[0-9]+\.[0-9]+\.[0-9]+$/
85+
branches:
86+
only: develop
4287

43-
- integration_test:
88+
- release:
89+
requires:
90+
- test
91+
- test_integration
4492
filters:
93+
<<: *tags_filters
4594
branches:
46-
only:
47-
- master
48-
- develop
95+
ignore: /.*/

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# [Monax Hoard](https://github.com/monax/hoard) Changelog
2+
## [0.2.0] - 2018-10-09
3+
### Changed
4+
- IPFS & GCP Support
5+
6+
7+
[0.2.0]: https://github.com/monax/hoard/commits/v0.2.0

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ EXPOSE 53431
2828

2929
ENV HOARD_JSON_CONFIG '{"ListenAddress":"tcp://:53431","Storage":{"StorageType":"memory","AddressEncoding":"base64"},"Logging":{"LoggingType":"logfmt","Channels":["info","trace"]}}'
3030

31-
CMD [ "hoard", "-e", "-l" ]
31+
ENTRYPOINT [ "hoard" ]

Gopkg.lock

Lines changed: 133 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)