-
Notifications
You must be signed in to change notification settings - Fork 98
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.
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
Fabo/1873 big mergeroo #1883
Merged
Merged
Fabo/1873 big mergeroo #1883
Changes from all commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
a29c2b9
add yarn audit check
sabau 330a6b2
fixes:
sabau 92e86cd
sudoing the npm global yarn update
sabau b60972e
try extended version exit code
sabau 6cc23d5
circleci audit: be more descriptive in errors
sabau 0e11960
Fabo/voyager web (#1804)
faboweb 04d3355
Merge branch 'web' into sabau/1806-yarn-audit-cci-check
sabau ba1db67
try oneliner
sabau 81e7130
restore extended version
sabau c203b1b
align snapshots
sabau 83183f5
Changelog
sabau 9d9462b
Merge pull request #1850 from cosmos/sabau/web/fix-snapshot-unit-test
faboweb 599ae33
Merge remote-tracking branch 'origin/web' into sabau/1806-yarn-audit-…
989d64a
Merge pull request #1822 from cosmos/sabau/1806-yarn-audit-cci-check
faboweb caca894
fix circleci audit job
sabau 83ea737
Add circleci audit job to CHANGELOG
sabau 15ef583
Merge pull request #1859 from cosmos/sabau/web/fix-audit
faboweb d86935d
Fabo/1831 reconnect (#1856)
faboweb a8bedb1
Fabo/1809 update header on send (#1830)
faboweb d92b865
Merge remote-tracking branch 'origin/web' into fabo/1873-big-mergeroo
6a57fc8
fixed several tests
68f8f21
persist denoms
ce132ad
fixed denom load tests
1406dd7
Apply suggestions from code review
fedekunze 9646d59
Merge remote-tracking branch 'origin/develop' into fabo/1873-big-merg…
0323582
fixed sendmodal tests
07ff58e
fixed signup
cf6e984
fixed optimistic update for delegation
0191bdc
erase password on close of action modal
e332357
Update app/src/renderer/main.js
sabau 386c33d
addressed comments
f93120f
Merge branch 'fabo/1873-big-mergeroo' of https://github.com/cosmos/vo…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -32,7 +32,7 @@ jobs: | |
|
||
changelogUpdated: | ||
docker: | ||
- image: circleci/node:10.13.0-browsers | ||
- image: circleci/node:10.15.0-browsers | ||
|
||
steps: | ||
- checkout | ||
|
@@ -41,7 +41,7 @@ jobs: | |
|
||
testUnit: | ||
docker: | ||
- image: circleci/node:10.13.0-browsers | ||
- image: circleci/node:10.15.0-browsers | ||
|
||
steps: | ||
- checkout | ||
|
@@ -51,8 +51,8 @@ jobs: | |
- v3-dependencies-root-{{ checksum "package.json" }} | ||
- v3-dependencies-root- | ||
|
||
- run: sudo npm -g uninstall yarn ; sudo npm -g install [email protected] | ||
- run: yarn install | ||
|
||
- save_cache: | ||
paths: | ||
- yarn.lock | ||
|
@@ -70,9 +70,33 @@ jobs: | |
command: bash <(curl -s https://codecov.io/bash) -t $CODECOV_TOKEN | ||
when: on_success | ||
|
||
security: | ||
docker: | ||
- image: circleci/node:10.15.0-browsers | ||
|
||
steps: | ||
- checkout | ||
|
||
- run: sudo npm -g uninstall yarn ; sudo npm -g install [email protected] | ||
|
||
- run: | ||
name: Audit | ||
command: | | ||
set +e | ||
|
||
SUMMARY="$(yarn audit | grep Severity)" | ||
VULNERABILITIES=".*(High|Critical).*" | ||
|
||
if [[ $SUMMARY =~ $VULNERABILITIES ]]; then | ||
echo "Unsafe dependencies found: $SUMMARY" >&2 | ||
exit 1 | ||
fi | ||
echo "Your dependencies are secure enough: $SUMMARY" | ||
exit 0 | ||
|
||
testE2e: | ||
docker: | ||
- image: circleci/node:10.13.0-browsers | ||
- image: circleci/node:10.15.0-browsers | ||
|
||
environment: | ||
- BINARY_PATH: "/home/circleci/project/builds/Gaia/linux_amd64/gaiacli" | ||
|
@@ -89,8 +113,8 @@ jobs: | |
- v2-dependencies-root-{{ checksum "package.json" }} | ||
- v2-dependencies-root- | ||
|
||
- run: sudo npm -g uninstall yarn ; sudo npm -g install [email protected] | ||
- run: yarn install | ||
|
||
- save_cache: | ||
paths: | ||
- yarn.lock | ||
|
@@ -109,7 +133,7 @@ jobs: | |
# Create release. | ||
release: | ||
docker: | ||
- image: circleci/node:10.13.0 | ||
- image: circleci/node:10.15.0 | ||
|
||
steps: | ||
- checkout | ||
|
@@ -119,13 +143,14 @@ jobs: | |
- v2-dependencies-root-{{ checksum "package.json" }} | ||
- v2-dependencies-root- | ||
|
||
- run: sudo npm -g uninstall yarn ; sudo npm -g install [email protected] | ||
- run: yarn install | ||
- run: node tasks/createReleasePR.js | ||
|
||
# Publish the release to GitHub. | ||
publish: | ||
docker: | ||
- image: circleci/node:10.13.0 | ||
- image: circleci/node:10.15.0 | ||
|
||
steps: | ||
- checkout | ||
|
@@ -145,6 +170,8 @@ jobs: | |
git tag -d release-candidate | ||
git push --delete bot release-candidate | ||
|
||
npm -g uninstall yarn ; npm -g install [email protected] | ||
|
||
sudo tasks/build/installWine.sh | ||
yarn install | ||
|
||
|
@@ -182,9 +209,14 @@ workflows: | |
branches: | ||
ignore: release | ||
|
||
- testE2e: | ||
requires: | ||
- buildGaia | ||
# - testE2e: | ||
# requires: | ||
# - buildGaia | ||
# filters: | ||
# branches: | ||
# ignore: release | ||
|
||
- security: | ||
filters: | ||
branches: | ||
ignore: release | ||
|
@@ -194,7 +226,7 @@ workflows: | |
- changelogUpdated | ||
- buildGaia | ||
- testUnit | ||
- testE2e | ||
# - testE2e | ||
filters: | ||
branches: | ||
only: develop | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
localhost:8080 { | ||
cors | ||
|
||
header / { | ||
Access-Control-Allow-Origin "*" | ||
Access-Control-Allow-Methods "OPTIONS, HEAD, GET, POST, PUT, DELETE" | ||
Access-Control-Allow-Headers "*" | ||
} | ||
|
||
proxy / https://localhost:9070/ { | ||
insecure_skip_verify | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"name": "Cosmos Voyager", | ||
"default_network": "local-testnet", | ||
"denoms": ["stake", "photino"], | ||
"node_lcd": "http://localhost:8080", | ||
"node_rpc": "http://localhost:26657", | ||
"google_analytics_uid": "UA-51029217-3", | ||
"sentry_dsn": "https://4dee9f70a7d94cc0959a265c45902d84:[email protected]/288169", | ||
"node_halted_timeout": 120000, | ||
"block_timeout": 10000, | ||
"default_gas": 500000 | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
instead of relying on a genesis, fixing the denoms for now