Skip to content

Commit

Permalink
Merge pull request #27 from blockchainsllc/master_gh
Browse files Browse the repository at this point in the history
Master gh
  • Loading branch information
simon-jentzsch authored Nov 16, 2021
2 parents 6df8a4a + 6fee8ea commit e86f57c
Show file tree
Hide file tree
Showing 69 changed files with 182,234 additions and 2,190 deletions.
22 changes: 20 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ image: docker.slock.it/build-images/node:10-alpine
stages:
- build
- package
- analysis
- deploy
- mirror

Expand Down Expand Up @@ -36,12 +37,29 @@ docker-package:
- docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME .
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME

vulnerabilities:
stage: analysis
tags:
- short-jobs
dependencies:
- docker-package
allow_failure: true
image: docker.slock.it/build-images/vulnerability-testing-tools
script:
- export TRIVY_AUTH_URL=$CI_REGISTRY
- export TRIVY_USERNAME=gitlab-ci-token
- export TRIVY_PASSWORD=$CI_JOB_TOKEN
- trivy -f json -o vulnerability_analysis.json --exit-code 1 $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
artifacts:
paths:
- vulnerability_analysis.json

.deploy-tmpl:
stage: deploy
except:
- branches
tags:
- short-jobs
- deployment
image: docker.slock.it/build-images/deployment
services:
- docker:dind
Expand Down Expand Up @@ -71,7 +89,7 @@ deploy-to-production:

mirror-to-github:
stage: mirror
image: docker.slock.it/build-images/deployment
when: manual
tags:
- short-jobs
only:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Piet
# Blockchains Piet
A tool helping to grasp solidity smart contract architectures.

[Live Demo](https://piet.slock.it/?container=examples%2Fexport1562664060589.piet.json)
[Live Demo](https://piet.blockchains.com/?container=examples%2Fexport1562664060589.piet.json)

**Warning:** Piet has not yet undergone in-depth testing and may contain serious bugs.

Expand Down
Binary file added assets/logo-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e86f57c

Please sign in to comment.