From ac9e73d9d24b57e6ef7e2f7619157e9dc3725517 Mon Sep 17 00:00:00 2001 From: Valentin Genev Date: Wed, 25 Jul 2018 13:19:33 +0300 Subject: [PATCH 1/2] Develop (#9) * added license * testing circleci (#8) * Readme slightly updated * Slight changes to circleCI config yaml * Changes to circleCI config in coverage tests section * Testing circleci * Fixed circleci format issue --- .circleci/config.yml | 55 +++++++++++++++++++++++--------------------- LICENSE.md | 10 ++++++++ 2 files changed, 39 insertions(+), 26 deletions(-) create mode 100644 LICENSE.md diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ecfef7d..0777ebbc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -157,10 +157,13 @@ jobs: command: mkdir -p ./test/results - run: name: Install tape and tap-xunit - command: npm install -g tape tapes tap-xunit + command: npm install -g tape tap-xunit + - run: + name: Install tapes + command: npm install -g tapes - run: name: Execute unit tests - command: npm -s run test:xunit > ./test/results/tape.xml + command: npm -s run test:xunit > ./test/results/tape.xml - store_artifacts: path: ./test/results prefix: test @@ -430,17 +433,17 @@ workflows: ignore: - /feature*/ - /bugfix*/ - # - test-integration: - # context: org-global - # requires: - # - setup - # filters: - # tags: - # only: /.*/ - # branches: - # ignore: - # - /feature*/ - # - /bugfix*/ +# - test-integration: +# context: org-global +# requires: +# - setup +# filters: +# tags: +# only: /.*/ +# branches: +# ignore: +# - /feature*/ +# - /bugfix*/ # - test-functional: # context: org-global # requires: @@ -452,17 +455,17 @@ workflows: # ignore: # - /feature*/ # - /bugfix*/ - # - test-spec: - # context: org-global - # requires: - # - setup - # filters: - # tags: - # only: /.*/ - # branches: - # ignore: - # - /feature*/ - # - /bugfix*/ +# - test-spec: +# context: org-global +# requires: +# - setup +# filters: +# tags: +# only: /.*/ +# branches: +# ignore: +# - /feature*/ +# - /bugfix*/ - build-snapshot: context: org-global requires: @@ -470,7 +473,7 @@ workflows: - test-unit - test-coverage # - test-integration -# - test-functional + # - test-functional # - test-spec filters: tags: @@ -495,7 +498,7 @@ workflows: - test-unit - test-coverage # - test-integration -# - test-functional + # - test-functional # - test-spec filters: tags: diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 00000000..2b6b2611 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,10 @@ +# LICENSE + +Copyright © 2017 Bill & Melinda Gates Foundation + +The Mojaloop files are made available by the Bill & Melinda Gates Foundation under the Apache License, Version 2.0 +(the "License") and you may not use these files except in compliance with the [License](http://www.apache.org/licenses/LICENSE-2.0). You may obtain a copy of the License at + +[http://www.apache.org/licenses/LICENSE-2.0]() + +Unless required by applicable law or agreed to in writing, the Mojaloop files are distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the [License](http://www.apache.org/licenses/LICENSE-2.0). From 8fe55ba3f08a05a66af2745a99ed7b55d1e4c392 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 9 Feb 2019 01:39:54 +0530 Subject: [PATCH 2/2] Incrementing version in package.json and adding badges (same as central-ledger) --- README.md | 8 +++++--- package.json | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b3dc66d6..1ea84162 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ # central-settlements -[![](https://images.microbadger.com/badges/version/mojaloop/central-settlement.svg)](https://microbadger.com/images/mojaloop/central-settlement "Get your own version badge on microbadger.com") -[![](https://images.microbadger.com/badges/image/mojaloop/central-settlement.svg)](https://microbadger.com/images/mojaloop/central-settlement "Get your own image badge on microbadger.com") -[![CircleCI](https://circleci.com/gh/mojaloop/central-settlement/tree/master.svg?style=svg)](https://circleci.com/gh/mojaloop/central-settlement/tree/master) +[![Git Commit](https://img.shields.io/github/last-commit/mojaloop/central-settlement.svg?style=flat)](https://github.com/mojaloop/central-settlement/commits/master) +[![Git Releases](https://img.shields.io/github/release/mojaloop/central-settlement.svg?style=flat)](https://github.com/mojaloop/central-settlement/releases) +[![Docker pulls](https://img.shields.io/docker/pulls/mojaloop/central-settlement.svg?style=flat)](https://hub.docker.com/r/mojaloop/central-settlement) +[![CircleCI](https://circleci.com/gh/mojaloop/central-settlement.svg?style=svg)](https://circleci.com/gh/mojaloop/central-settlement) + The Central Settlements service is part of the Mojaloop project and deployment. diff --git a/package.json b/package.json index 06d2e01c..5b59009c 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { "name": "central-settlement", - "description": "Central settlements hosted by a scheme to record and settle settlements.", - "version": "5.1.0", + "description": "Central settlements hosted by a scheme to record and make settlements.", + "version": "5.1.1", "license": "Apache-2.0", "private": true, - "author": "Valentin Genev ", + "author": "Valentin Genev , Georgi Georgiev ", "contributors": [ "Deon Botha ", "Miguel de Barros "