Skip to content

Commit

Permalink
Merge pull request #1044 from mesg-foundation/dev
Browse files Browse the repository at this point in the history
v0.10 PR
  • Loading branch information
Nicolas Mahé authored Jun 11, 2019
2 parents 3a0796f + df7496c commit 3a84bcd
Show file tree
Hide file tree
Showing 230 changed files with 4,004 additions and 10,237 deletions.
83 changes: 48 additions & 35 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,31 @@ jobs:
- checkout
- setup_remote_docker
- run: docker swarm init
- run: docker build -t sleep docker-images/sleep/
- run: docker build -t http-server docker-images/http-server/
- <<: *restore_go_mod_cache
- run: go mod download
- <<: *save_go_mod_cache
- run: mkdir -p ~/.mesg
- <<: *restore_go_cache
- run: go test -v -timeout 300s -p 1 -tags=integration -coverprofile=coverage.txt ./...
- run: go test -v -timeout 300s -coverprofile=coverage.txt ./...
- <<: *save_go_cache
- run: bash <(curl -s https://codecov.io/bash)

"test_integration":
<<: *run_on_docker
environment:
- GOCACHE: *go_cache_dir
steps:
- checkout
- setup_remote_docker
- run: docker swarm init
- run: docker build -t sleep docker-images/sleep/
- run: docker build -t http-server docker-images/http-server/
- <<: *restore_go_mod_cache
- run: go mod download
- <<: *save_go_mod_cache
- run: mkdir -p ~/.mesg
- run: go test -v -timeout 300s -p 1 -tags=integration ./...

"lint":
docker:
- image: golangci/golangci-lint:v1.12
Expand All @@ -64,42 +78,24 @@ jobs:
- <<: *restore_go_mod_cache
- run: go mod download
- <<: *save_go_mod_cache
- <<: *restore_go_cache
- run: golangci-lint run
- <<: *save_go_cache

"publish_docker_dev":
<<: *run_on_machine
steps:
- checkout
- run: docker build -t mesg/core:dev --build-arg version="dev build `echo $CIRCLE_SHA1 | cut -c1-7`" .
- run: docker build -t mesg/engine:dev --build-arg version="dev build `echo $CIRCLE_SHA1 | cut -c1-7`" .
- run: docker login -u $DOCKER_USER -p $DOCKER_PASS
- run: docker push mesg/core:dev
- run: docker push mesg/engine:dev

"publish_docker_prod":
<<: *run_on_machine
steps:
- checkout
- run: docker build -t mesg/core:$CIRCLE_TAG -t mesg/core:latest --build-arg version=$CIRCLE_TAG .
- run: docker build -t mesg/engine:$CIRCLE_TAG -t mesg/engine:latest --build-arg version=$CIRCLE_TAG .
- run: docker login -u $DOCKER_USER -p $DOCKER_PASS
- run: docker push mesg/core:$CIRCLE_TAG
- run: docker push mesg/core:latest

"release_cli_dev":
<<: *run_on_docker
steps:
- checkout
- run: scripts/build-cli.sh "dev build `echo $CIRCLE_SHA1 | cut -c1-7`"
- run: go get -u github.com/tcnksm/ghr
- run: ghr -u mesg-foundation -r engine -delete -prerelease -n "Developer Release" -b "Warning - this is a developer release, use it only if you know what are doing. Make sure to pull the latest \`mesg/core:dev\` image. \`\`\`docker pull mesg/core:dev\`\`\`" release-dev ./bin

"release_cli_prod":
<<: *run_on_docker
steps:
- checkout
- run: scripts/build-cli.sh $CIRCLE_TAG
- run: go get -u github.com/tcnksm/ghr
- run: ghr -u mesg-foundation -r engine -delete $CIRCLE_TAG ./bin
- run: docker push mesg/engine:$CIRCLE_TAG
- run: docker push mesg/engine:latest

workflows:
version: 2
Expand All @@ -122,6 +118,14 @@ workflows:
ignore:
- "dev"
- "master"
- "test_integration":
filters:
tags:
ignore: /.*/
branches:
ignore:
- "dev"
- "master"

release_dev:
jobs:
Expand All @@ -137,13 +141,17 @@ workflows:
ignore: /.*/
branches:
only: dev
- "test_integration":
filters:
tags:
ignore: /.*/
branches:
only: dev
- "publish_docker_dev":
requires:
- "test"
- "test_integration"
- "lint"
- "release_cli_dev":
requires:
- "publish_docker_dev"

test_prod:
jobs:
Expand All @@ -153,6 +161,12 @@ workflows:
ignore: /.*/
branches:
only: master
- "test_integration":
filters:
tags:
ignore: /.*/
branches:
only: master
- "lint":
filters:
tags:
Expand All @@ -174,18 +188,17 @@ workflows:
only: /^v.*/
branches:
ignore: /.*/
- "publish_docker_prod":
requires:
- "test"
- "lint"
- "test_integration":
filters:
tags:
only: /^v.*/
branches:
ignore: /.*/
- "release_cli_prod":
- "publish_docker_prod":
requires:
- "publish_docker_prod"
- "test"
- "lint"
- "test_integration"
filters:
tags:
only: /^v.*/
Expand Down
40 changes: 32 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,50 @@
#### Changed
#### Fixed
#### Removed
#### Documentation

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

#### Breaking Changes

- ([#928](https://github.com/mesg-foundation/engine/pull/928)) Rename `volumesfrom` to `volumesFrom` in services' `mesg.yml`.
- ([#974](https://github.com/mesg-foundation/engine/pull/974)) Reduce the number of service outputs to one. An output can still contain multiple parameters. ([#963](https://github.com/mesg-foundation/engine/pull/963)). ([#964](https://github.com/mesg-foundation/engine/pull/964)). ([#965](https://github.com/mesg-foundation/engine/pull/965)). ([#967](https://github.com/mesg-foundation/engine/pull/967)). ([#971](https://github.com/mesg-foundation/engine/pull/971)). ([#972](https://github.com/mesg-foundation/engine/pull/972)). ([#973](https://github.com/mesg-foundation/engine/pull/973)). ([#975](https://github.com/mesg-foundation/engine/pull/975)). ([#976](https://github.com/mesg-foundation/engine/pull/976)). ([#977](https://github.com/mesg-foundation/engine/pull/977)). ([#978](https://github.com/mesg-foundation/engine/pull/978)). ([#979](https://github.com/mesg-foundation/engine/pull/979)). ([#980](https://github.com/mesg-foundation/engine/pull/980)). ([#981](https://github.com/mesg-foundation/engine/pull/981)). ([#982](https://github.com/mesg-foundation/engine/pull/982)). ([#983](https://github.com/mesg-foundation/engine/pull/983)). ([#984](https://github.com/mesg-foundation/engine/pull/984)). ([#987](https://github.com/mesg-foundation/engine/pull/987)). ([#988](https://github.com/mesg-foundation/engine/pull/988)). ([#1028](https://github.com/mesg-foundation/engine/pull/1028)).
- ([#791](https://github.com/mesg-foundation/engine/pull/791)) Remove CLI from the repository. The new cli is available on a [dedicated repository](https://github.com/mesg-foundation/cli). ([#995](https://github.com/mesg-foundation/engine/pull/995)). ([#996](https://github.com/mesg-foundation/engine/pull/996)).
- ([#991](https://github.com/mesg-foundation/engine/pull/991)) Rename Core to Engine. ([#968](https://github.com/mesg-foundation/engine/pull/968)). ([#970](https://github.com/mesg-foundation/engine/pull/970)). ([#1002](https://github.com/mesg-foundation/engine/pull/1002)). ([#1003](https://github.com/mesg-foundation/engine/pull/1003)). ([#1004](https://github.com/mesg-foundation/engine/pull/1004)). ([#1020](https://github.com/mesg-foundation/engine/pull/1020)).
- ([#1032](https://github.com/mesg-foundation/engine/pull/1032)) Simplify Engine configs. ([#1038](https://github.com/mesg-foundation/engine/pull/1038)).

#### Added

- ([#1014](https://github.com/mesg-foundation/engine/pull/1014)) Introduce new deployment api. Only available for development purpose.

#### Changed

- ([#994](https://github.com/mesg-foundation/engine/pull/994)) Update execution database and api. ([#1006](https://github.com/mesg-foundation/engine/pull/1006)). ([#1007](https://github.com/mesg-foundation/engine/pull/1007)). ([#1041](https://github.com/mesg-foundation/engine/pull/1041)).
- ([#997](https://github.com/mesg-foundation/engine/pull/997)) Rename package `api` to `sdk`.
- ([#998](https://github.com/mesg-foundation/engine/pull/998)) Rename package `interface` to `server`.

#### Fixed

- ([#955](https://github.com/mesg-foundation/engine/pull/955)) Catch error when the volume is deleted and it did not exist.

#### Removed

- [#1001](https://github.com/mesg-foundation/engine/pull/1001) Remove web3 http request logs from Marketplace.

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

#### Added

- ([#993](https://github.com/mesg-foundation/engine/pull/993)) Display web3 http request logs in Marketplace
- ([#993](https://github.com/mesg-foundation/engine/pull/993)) Display web3 http request logs in Marketplace.

#### Changed

- ([#949](https://github.com/mesg-foundation/engine/pull/949)) Use MESG's IPFS node in CLI
- ([#949](https://github.com/mesg-foundation/engine/pull/949)) Use MESG's IPFS node in CLI.

#### Fixed

- ([#930](https://github.com/mesg-foundation/engine/pull/930)) Improve generated README when using command `service gen-doc`. ([#948](https://github.com/mesg-foundation/engine/pull/948)). ([#960](https://github.com/mesg-foundation/engine/pull/960)).
- ([#934](https://github.com/mesg-foundation/engine/pull/934)) Return error when image is passed in configuration in mesg.yml
- ([#929](https://github.com/mesg-foundation/engine/pull/929)) Show better error when deploying service
- ([#934](https://github.com/mesg-foundation/engine/pull/934)) Return error when an image is passed on a mesg.yml definition.
- ([#929](https://github.com/mesg-foundation/engine/pull/929)) Show more verbose error when deploying service.

#### Documentation

Expand Down Expand Up @@ -60,9 +87,6 @@
- ([#772](https://github.com/mesg-foundation/core/pull/772)) Improve command logs errors.
- ([#820](https://github.com/mesg-foundation/core/pull/820)) Fix container package.

#### Removed
#### Documentation

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

#### Fixed
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ To report a bug, please [check for existing issues, then if you can't find your

For contributions to Services and Applications, we have a [curated list of Awesome Services and Applications](https://github.com/mesg-foundation/awesome) that we'd love for you to participate in.

For contribution to MESG Core, be sure to subscribe to the development/core category on the [forum](https://forum.mesg.com/c/development/core) and reach out to us. We would love to include you in the development process.
For contribution to MESG Engine, be sure to subscribe to the development/core category on the [forum](https://forum.mesg.com/c/development/core) and reach out to us. We would love to include you in the development process.

# Start Developing Core

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends ca-certificates=20180409 && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
COPY ./bin/core .
CMD [ "./core" ]
COPY ./bin/engine .
CMD [ "./engine" ]
19 changes: 8 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
<p align="center">
<img src="https://cdn.rawgit.com/mesg-foundation/core/dev/logo.svg" alt="MESG Core" height="120">
<br/><br/>
</p>
# MESG Engine

[Website](https://mesg.com/) - [Docs](https://docs.mesg.com/) - [Forum](https://forum.mesg.com/) - [Chat](https://discordapp.com/invite/SaZ5HcE) - [Blog](https://medium.com/mesg)

Expand All @@ -15,13 +12,13 @@

MESG is a platform for the creation of efficient and easy-to-maintain applications that connect any and all technologies.

MESG Core is a communication and connection layer which manages the interaction of all connected services and applications so they can remain lightweight, yet feature packed.
MESG Engine is a communication and connection layer which manages the interaction of all connected services and applications so they can remain lightweight, yet feature packed.

To build an application, follow the [Quick Start Guide](#quick-start-guide)

If you'd like to build Services and share them with the community, go to the [Services](#services) section.

To help us build and maintain MESG Core, refer to the [Contribute](#contribute) section below.
To help us build and maintain MESG Engine, refer to the [Contribute](#contribute) section below.

# Contents

Expand All @@ -40,17 +37,17 @@ This guide will show you step-by-step how to create an application that sends a

### 1. Installation

Run the following command in a console to install MESG Core:
Run the following command in a console to install MESG Engine:

```bash
bash <(curl -fsSL https://mesg.com/install)
```

You can also install it manually by following [this guide](https://docs.mesg.com/guide/installation.html).

### 2. Run MESG Core
### 2. Run MESG Engine

MESG Core runs as a daemon. To start it, execute:
MESG Engine runs as a daemon. To start it, execute:

```bash
mesg-core start
Expand All @@ -74,7 +71,7 @@ Deploy the [invite discord service](https://github.com/mesg-foundation/service-d
mesg-core service deploy https://github.com/mesg-foundation/service-discord-invitation
```

Once the service is deployed, the console displays its id. This id is a unique way for the application to connect to the right service through MESG Core. You'll need to use them inside the application.
Once the service is deployed, the console displays its id. This id is a unique way for the application to connect to the right service through MESG Engine. You'll need to use them inside the application.

### 4. Create the application

Expand Down Expand Up @@ -189,7 +186,7 @@ Check out the documentation for more information on [how to create tasks](https:

### Submitting Events

Services can also submit events to MESG Core. They allow two-way communication with MESG Core and Applications.
Services can also submit events to MESG Engine. They allow two-way communication with MESG Engine and Applications.

Let's say the service is an HTTP web server. An event could be submitted when the web server receives a request with the request's payload as the event's data. The service could also submit a specific event for every route of your HTTP API.

Expand Down
Loading

0 comments on commit 3a84bcd

Please sign in to comment.