Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasMahe committed Dec 29, 2018
2 parents 95b2dae + abe8f2a commit 85edf1f
Show file tree
Hide file tree
Showing 205 changed files with 1,588 additions and 111,766 deletions.
22 changes: 21 additions & 1 deletion .circleci/config.yml
Expand Up @@ -7,7 +7,7 @@ runOnMachine: &runOnMachine

runOnDocker: &runOnDocker
docker:
- image: circleci/golang:1.10
- image: circleci/golang:1.11
working_directory: /go/src/github.com/mesg-foundation/core

jobs:
Expand Down Expand Up @@ -88,6 +88,12 @@ workflows:

release_dev:
jobs:
- "lint":
filters:
tags:
ignore: /.*/
branches:
only: dev
- "test":
filters:
tags:
Expand All @@ -97,6 +103,7 @@ workflows:
- "publish_docker_dev":
requires:
- "test"
- "lint"
- "release_cli_dev":
requires:
- "publish_docker_dev"
Expand All @@ -109,9 +116,21 @@ workflows:
ignore: /.*/
branches:
only: master
- "lint":
filters:
tags:
ignore: /.*/
branches:
only: master

release_prod:
jobs:
- "lint":
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
- "test":
filters:
tags:
Expand All @@ -121,6 +140,7 @@ workflows:
- "publish_docker_prod":
requires:
- "test"
- "lint"
filters:
tags:
only: /^v.*/
Expand Down
23 changes: 22 additions & 1 deletion CHANGELOG.md
Expand Up @@ -2,6 +2,7 @@

## [Unreleased](https://github.com/mesg-foundation/core/releases/tag/)

#### Breaking Changes
#### Added

- ([#535](https://github.com/mesg-foundation/core/pull/535)) Run MESG with MESG! A base logic implemented to have system services for core. In future, core will be split to system services and only act as a proxy to them. System services are placed under `~/.mesg/systemservices`. [\#567](https://github.com/mesg-foundation/core/pull/567).
Expand All @@ -11,6 +12,26 @@
#### Removed
#### Documentation

## [v0.6.0](https://github.com/mesg-foundation/core/releases/tag/v0.6.0)

#### Added

- ([\#641](https://github.com/mesg-foundation/core/pull/641)) Services definition accept env variables. Users can override them on deploy. [\#660](https://github.com/mesg-foundation/core/pull/660). [\#666](https://github.com/mesg-foundation/core/pull/666).
- ([\#651](https://github.com/mesg-foundation/core/pull/651)) Error added in task execution result.

#### Changed

- ([\#611](https://github.com/mesg-foundation/core/pull/611)) Switch to go1.11.
- ([\#648](https://github.com/mesg-foundation/core/pull/672)) Print all service definition in command `service detail`.
- ([\#649](https://github.com/mesg-foundation/core/pull/649)) Lowercase sid.

#### Documentation

- ([\#638](https://github.com/mesg-foundation/core/pull/638)) Fix marketplace link
- ([\#643](https://github.com/mesg-foundation/core/pull/643)) Add instruction to start the core without CLI
- ([\#656](https://github.com/mesg-foundation/core/pull/656)) Show instruction to create manually system services folder
- ([\#665](https://github.com/mesg-foundation/core/pull/665)) Add favicon

## [v0.5.0](https://github.com/mesg-foundation/core/releases/tag/v0.5.0)

#### Breaking Changes
Expand All @@ -19,7 +40,7 @@

#### Added

- ([\#583](https://github.com/mesg-foundation/core/pull/583)) Add property SID (Service ID) in service definition file. Allow a service to reuse the same volumes after stopping. [\#627](https://github.com/mesg-foundation/core/pull/627). [\#613](https://github.com/mesg-foundation/core/pull/613). [\#619](https://github.com/mesg-foundation/core/pull/619).
- ([\#583](https://github.com/mesg-foundation/core/pull/583)) Add property Sid (Service ID) in service definition file. Allow a service to reuse the same volumes after stopping. [\#627](https://github.com/mesg-foundation/core/pull/627). [\#613](https://github.com/mesg-foundation/core/pull/613). [\#619](https://github.com/mesg-foundation/core/pull/619).

#### Changed

Expand Down

0 comments on commit 85edf1f

Please sign in to comment.