Skip to content

Commit

Permalink
Merge branch 'dev' into feature/remove-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasMahe authored May 29, 2019
2 parents 203280d + 458d084 commit 7b11471
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,15 @@ jobs:
- 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 core -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
- 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 core -delete $CIRCLE_TAG ./bin
- run: ghr -u mesg-foundation -r engine -delete $CIRCLE_TAG ./bin

workflows:
version: 2
Expand Down
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,25 @@
#### Removed
#### Documentation

## [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

#### Changed

- ([#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

#### Documentation

- ([#953](https://github.com/mesg-foundation/engine/pull/953)) Fix links to docs

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

Expand Down
3 changes: 1 addition & 2 deletions systemservices/marketplace/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion systemservices/marketplace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"mesg-js": "^2.0.1",
"request": "^2.88.0",
"request-promise-native": "^1.0.7",
"web3": "1.0.0-beta.37"
"web3": "1.0.0-beta.37",
"web3-providers-http": "git+https://github.com/NicolasMahe/web3-providers-http.git"
},
"devDependencies": {
"@types/node": "^10.14.4",
Expand Down

0 comments on commit 7b11471

Please sign in to comment.