From 0ba6f15782e704c4ce69ef2f901135029668b1c9 Mon Sep 17 00:00:00 2001 From: eoln <2881004+eoln@users.noreply.github.com> Date: Tue, 7 Jul 2020 08:47:09 +0200 Subject: [PATCH] Update pisp/master (#755) * fix for python error in CI (#733) Co-authored-by: Shashi * Ensure 'timeout-reserved' notification action passes through and not converted to 'abort' action (#736) * Update CS shared (#737) * Feature/1332 enable on-us transfers (#738) * Added ENABLE_ON_US_TRANSFERS * Bumped up the version * Feature/otc 525 implement get transaction object by transfer (#735) * OTC-525 Implement GET transaction Object by transferId Changes: Updated swagger def to include new endpoints for: - Get transaction by transfer id - Post ledger entry Added new method for: - Get transaction by transfer id Added unit tests for Get transaction by transfer id * OTC-525 Implement GET transaction Object by transferId Bumput up versions * OTC-525 Implement GET transaction Object by transferId Resolved dependency updates * OTC-525 Implement GET transaction Object by transferId * OTC-525 Implement GET transaction Object by transferId Changes: Updated swagger def to include new endpoints for: - Get transaction by transfer id Added new method for: - Get transaction by transfer id Added unit tests for Get transaction by transfer id * changed docker dependency in circle CI image scan from python-dev to python3-dev (#741) * Updated python in some other places in circle CI (#742) * Fix the image scan step in circle CI * Resolved audit checks * Feature/#1335 aborted on put (#740) * added error log if action REJECT comes into fulfil handler Co-authored-by: Valentin * Bugfix/deadlock on adjust limits (#745) * added unique index on participantLimit and logging * added unique index on participantLimit and logging * resolve audit issues * fixed coverage tests Co-authored-by: Shashi * Updated dependencies and product version for issue: https://github.com/mojaloop/project/issues/1378 (#747) * Update error message (#749) * Update error message when Payer FSP and Payee FSP are the same and on-us is not enabled.. (Added text "FSP" to specify) * Updated unit test * #1423: Bulk transfers error processing in Central Ledger (#743) * Updates for bulk error processing * Bump version * Updates for bulk transfer error processing * Updates for bulk transfer error processing * More updates for bulk error processing * changes to cater for bulk_abort * updated central-services-shared * Updates for bulk error processing * Add unit test for BULK_ABORT branch in transfer fulfil handler * Add unit test for BULK_ABORT branch in transfer facade * Small fix for position handler test for BULK_ABORT branch Co-authored-by: Rajiv Mothilal * Bump version for release (#750) * Feature/#1334 patch request notif (#751) * added handling of request for notification by payee functionality * improved coverage and added missing action letter Co-authored-by: Valentin * chore(package): update contributors list & deps * chore: audit & deps update Co-authored-by: shashi165 <33355509+shashi165@users.noreply.github.com> Co-authored-by: Shashi Co-authored-by: Steven Oderayi Co-authored-by: vijayg10 <33152110+vijayg10@users.noreply.github.com> Co-authored-by: lazolalucas Co-authored-by: Valentin Genev Co-authored-by: Valentin Co-authored-by: Adrian Enns Co-authored-by: Sam <10507686+elnyry-sam-k@users.noreply.github.com> Co-authored-by: Rajiv Mothilal --- .circleci/config.yml | 11 ++++++++++- package.json | 4 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e2ba0ceb6..5d3f5e6a4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -56,7 +56,6 @@ executors: default-machine: machine: image: ubuntu-1604:201903-01 - ## # Jobs # @@ -253,6 +252,16 @@ jobs: apk add --no-cache -t build-dependencies make gcc g++ python3 libtool autoconf automake npm config set unsafe-perm true npm install -g node-gyp + - run: + name: Install general dependencies + command: | + apk --no-cache add git + apk --no-cache add ca-certificates + apk --no-cache add curl + apk --no-cache add openssh-client + apk add --no-cache -t build-dependencies make gcc g++ python3 libtool autoconf automake + npm config set unsafe-perm true + npm install -g node-gyp - run: name: Install AWS CLI dependencies command: *defaults_awsCliDependencies diff --git a/package.json b/package.json index f654e2bb0..f37a968a9 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,9 @@ "Sam Kummary ", "Steven Oderayi ", "Valentin Genev ", - "Shashikant Hirugade " + "Shashikant Hirugade ", + "Paweł Marzec ", + "Kevin Leylow " ], "repository": { "type": "git",