Skip to content

Commit

Permalink
ci(mojaloop/#3454): remove unneeded configs (#166)
Browse files Browse the repository at this point in the history
ci(mojaloop/#3454): remove unneeded configs -  mojaloop/project#3454
- removed unneeded NVM and AWS configs
- replaced deprecated `prefix` property with `destination`
- updated `github-cli` circleci orb
  • Loading branch information
oderayi authored Aug 23, 2023
1 parent 6c4d60b commit 29f792f
Show file tree
Hide file tree
Showing 10 changed files with 1,034 additions and 1,212 deletions.
20 changes: 5 additions & 15 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version: 2.1
orbs:
slack: circleci/slack@4.12.5 # Ref: https://github.com/mojaloop/ci-config/tree/master/slack-templates
pr-tools: mojaloop/pr-tools@0.1.10 # Ref: https://github.com/mojaloop/ci-config/
gh: circleci/github-cli@2.1.0
gh: circleci/github-cli@2.2.0

##
# defaults
Expand All @@ -28,9 +28,6 @@ defaults_docker_Dependencies: &defaults_docker_Dependencies |
apk --no-cache add bash bash-doc bash-completion
apk --no-cache add -t build-dependencies make gcc g++ python3 libtool autoconf automake jq

defaults_awsCliDependencies: &defaults_awsCliDependencies |
apk --no-cache add aws-cli

defaults_license_scanner: &defaults_license_scanner
name: Install and set up license-scanner
command: |
Expand Down Expand Up @@ -218,7 +215,7 @@ jobs:
command: npm -s run test:unit
- store_artifacts:
path: ./test/results
prefix: test
destination: test
- store_test_results:
path: ./test/results

Expand All @@ -240,10 +237,10 @@ jobs:
command: mkdir -p ./audit/results
- run:
name: Check for new npm vulnerabilities
command: npm run audit:check --silent -- --json > ./audit/results/auditResults.json
command: npm run audit:check -- -o json > ./audit/results/auditResults.json
- store_artifacts:
path: ./audit/results
prefix: audit
destination: audit

audit-licenses:
executor: default-docker
Expand All @@ -254,16 +251,14 @@ jobs:
- checkout
- run:
<<: *defaults_license_scanner
- run:
<<: *defaults_configure_nvm
- restore_cache:
key: dependency-cache-{{ .Environment.CIRCLE_SHA1 }}
- run:
name: Run the license-scanner
command: cd /tmp/license-scanner && pathToRepo=$CIRCLE_WORKING_DIRECTORY make run
- store_artifacts:
path: /tmp/license-scanner/results
prefix: licenses
destination: licenses

release:
executor: default-docker
Expand All @@ -272,8 +267,6 @@ jobs:
name: Install general dependencies
command: *defaults_docker_Dependencies
- checkout
- run:
<<: *defaults_configure_nvm
- restore_cache:
name: Restore dependency cache
keys:
Expand Down Expand Up @@ -308,8 +301,6 @@ jobs:
sudo apt-get update && sudo apt-get install -y git
- gh/install
- checkout
- run:
<<: *defaults_configure_nvm
- run:
<<: *defaults_configure_git
- run:
Expand Down Expand Up @@ -429,7 +420,6 @@ jobs:
template: SLACK_TEMP_RELEASE_FAILURE

workflows:
version: 2
build_and_test:
jobs:
- pr-tools/pr-title-check:
Expand Down
8 changes: 8 additions & 0 deletions audit-ci.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"$schema": "https://github.com/IBM/audit-ci/raw/main/docs/schema.json",
// audit-ci supports reading JSON, JSONC, and JSON5 config files.
// Only use one of ["low": true, "moderate": true, "high": true, "critical": true]
"moderate": true,
"allowlist": [
]
}
Empty file removed audit-resolve.json
Empty file.
Loading

0 comments on commit 29f792f

Please sign in to comment.