Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: sync pisp/master with v11.1.2 #382

Merged
merged 17 commits into from
Dec 23, 2020
Merged

chore: sync pisp/master with v11.1.2 #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1363ddb
Updated versions for error-handler, etc... (#342)
aenns May 29, 2020
883ec9e
Bugfix/send request span finishing before function completed (#352)
rmothilal Jun 2, 2020
c29c080
Updated api_swagger.json as per version 1.1 of the FSPIOP spec and re…
ndonnan Jun 8, 2020
ec548fc
Feature/validation for name place accents (#353)
rmothilal Jun 15, 2020
7fad1d1
Updated python in Circle CI (#357)
rmothilal Jun 15, 2020
6092813
Updated dependencies for issue: https://github.com/mojaloop/project/i…
aenns Jun 17, 2020
4a308a7
#1484: Update FSPIOP API version (#367)
oderayi Aug 6, 2020
ad7fa57
Feature/updated shared library to cater for delete (#368)
rmothilal Aug 24, 2020
e7933ac
Feature/updated openapi backend version (#369)
rmothilal Aug 27, 2020
a8896d8
updated shared lib version to allow configurable resource versions (#…
vgenev Sep 9, 2020
08ddbd4
updated shared lib version (#371)
vgenev Sep 21, 2020
3ca778a
Updating dependencies for new helm release (#373)
rmothilal Oct 1, 2020
ce1360b
Merge tag 'v11.1.2' into chore/pisp-sync-v11.1.2
kleyow Dec 21, 2020
c88171b
chore: fix swagger
kleyow Dec 21, 2020
e9078c4
chore: upgrade packages and resolve audit
kleyow Dec 21, 2020
e77a009
chore: change packages to pass license scan
kleyow Dec 21, 2020
ae86fc1
chore: rearrange checkout
kleyow Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ defaults_Dependencies: &defaults_Dependencies |
npm install -g node-gyp

defaults_awsCliDependencies: &defaults_awsCliDependencies |
apk upgrade --no-cache
apk --no-cache add \
python3 \
py3-pip \
groff \
less \
mailcap
pip3 install --upgrade pip awscli==1.14.5 s3cmd==2.0.1 python-magic
apk upgrade --no-cache
apk --no-cache add \
python3 \
py3-pip \
groff \
less \
mailcap
pip3 install --upgrade pip awscli==1.14.5 s3cmd==2.0.1 python-magic
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest checking thatcheckout steps are after installing dependencies so checkout is done with the latest git


defaults_license_scanner: &defaults_license_scanner
name: Install and set up license-scanner
Expand Down Expand Up @@ -66,10 +66,10 @@ jobs:
setup:
executor: default-docker
steps:
- checkout
- run:
name: Install general dependencies
command: *defaults_Dependencies
- checkout
- run:
name: Access npm folder as root
command: cd $(npm root -g)/npm
Expand All @@ -87,10 +87,10 @@ jobs:
test-unit:
executor: default-docker
steps:
- checkout
- run:
name: Install general dependencies
command: *defaults_Dependencies
- checkout
- restore_cache:
keys:
- dependency-cache-{{ checksum "package.json" }}
Expand All @@ -109,13 +109,13 @@ jobs:
test-coverage:
executor: default-docker
steps:
- checkout
- run:
name: Install general dependencies
command: *defaults_Dependencies
- run:
name: Install AWS CLI dependencies
command: *defaults_awsCliDependencies
- checkout
- restore_cache:
keys:
- dependency-cache-{{ checksum "package.json" }}
Expand Down Expand Up @@ -236,14 +236,17 @@ jobs:
executor: anchore/anchore_engine
steps:
- setup_remote_docker
- checkout
- run:
name: Install docker dependencies for anchore
command: |
apk add --update python3 py3-pip docker python3-dev libffi-dev openssl-dev gcc libc-dev make jq npm
apk add --update py-pip docker python-dev libffi-dev openssl-dev gcc libc-dev make jq npm
- run:
name: Install general dependencies
command: *defaults_Dependencies
- run:
name: Install AWS CLI dependencies
command: *defaults_awsCliDependencies
- checkout
- attach_workspace:
at: /tmp
- run:
Expand Down
1 change: 1 addition & 0 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
LIB_RESOURCE_VERSIONS="transfers=1.1,participants=1.1"
10 changes: 1 addition & 9 deletions .ncurc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
{
"reject": [
"@hapi/hapi",
"@hapi/inert",
"@hapi/vision",
"hapi-swagger",
"hapi-openapi"
]
}
{}
Loading