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

Fix the circle ci python issue #441

Merged
merged 15 commits into from
Jun 12, 2020
Merged

Fix the circle ci python issue #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d3b42d4
Merge pull request #2 from mojaloop/master
shashi165 May 5, 2020
28fa428
Merge pull request #3 from mojaloop/master
shashi165 Jun 3, 2020
a7c89d8
Merge pull request #4 from mojaloop/master
shashi165 Jun 6, 2020
829c528
fulfil dup not signed fix
Jun 6, 2020
de3c5c4
cleanup
Jun 8, 2020
5cb4c0e
Merge pull request #5 from mojaloop/master
shashi165 Jun 10, 2020
5932f5b
merge master
Jun 10, 2020
1f41b10
resolve audit failures
Jun 12, 2020
fe78abd
Merge pull request #6 from mojaloop/master
shashi165 Jun 12, 2020
6c0a3e3
resolve audit failures
Jun 12, 2020
edd7869
Merge pull request #7 from mojaloop/master
shashi165 Jun 12, 2020
4f7f14e
Merge branch 'master' into hotfix/JWSnotSignedForFulfilDuplicate
Jun 12, 2020
518e592
fix circle ci config
Jun 12, 2020
5849427
fix circle ci config
Jun 12, 2020
f679e17
fix circle ci config
Jun 12, 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
16 changes: 11 additions & 5 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +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 awscli==1.14.5 s3cmd==2.0.1 python-magic
pip3 install --upgrade pip awscli==1.14.5 s3cmd==2.0.1 python-magic

defaults_license_scanner: &defaults_license_scanner
name: Install and set up license-scanner
Expand All @@ -55,8 +56,6 @@ executors:
default-machine:
machine:
image: ubuntu-1604:201903-01


##
# Jobs
#
Expand Down Expand Up @@ -276,10 +275,17 @@ jobs:
- run:
name: Install docker dependencies for anchore
command: |
apk add --update py-pip docker python-dev libffi-dev openssl-dev gcc libc-dev make jq npm
apk add --update py-pip docker python3-dev libffi-dev openssl-dev gcc libc-dev make jq npm
- run:
name: Install general dependencies
command: *defaults_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
Expand Down
126 changes: 81 additions & 45 deletions package-lock.json
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"@hapi/joi-date": "2.0.1",
"@hapi/vision": "6.0.0",
"@mojaloop/central-services-error-handling": "10.4.1",
"@mojaloop/central-services-health": "10.1.0",
"@mojaloop/central-services-health": "10.4.0",
"@mojaloop/central-services-logger": "10.4.0",
"@mojaloop/central-services-metrics": "9.5.0",
"@mojaloop/central-services-shared": "10.4.3",
Expand Down