Skip to content

Commit

Permalink
Merge pull request #2317 from daostack/release
Browse files Browse the repository at this point in the history
Release 1.0.3
  • Loading branch information
roienatan authored Dec 13, 2020
2 parents 2d46f6f + d0fc8b5 commit e4d6899
Show file tree
Hide file tree
Showing 130 changed files with 14,622 additions and 31,044 deletions.
7 changes: 4 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"settings": {
"react": {
"version": "detect", // React version. "detect" automatically picks the version you have installed.
"version": "detect" // React version. "detect" automatically picks the version you have installed.
}
},
"rules": {
Expand Down Expand Up @@ -72,11 +72,12 @@
"comma-dangle": ["error" ,"always-multiline"],
"semi": ["error", "always"],
"eol-last": "error",
"eqeqeq": "error",
"eqeqeq": "error"
},
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "react"],
"parserOptions": {
"project": "./tsconfig.eslint.json"
}
},
"ignorePatterns": ["test/**/*.conf.js"]
}
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ subgraph.yaml
build/
*.scss.d.ts
*.ps1
.idea
.npm

test/integration/.dist
44 changes: 44 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
stages:
- All In One Script

cache:
key: ${sha1sum package-lock.json}
paths:
- .npm/

before_script:
- npm -v
- node -v
- npm ci --cache .npm --prefer-offline
- npm rebuild

Single Test For Performance:
stage: All In One Script
interruptible: true
resource_group: docker-compose
script:
- docker -v
- docker-compose -v
- echo "rebuild docker-compose ONLY if config was changed"
- cmp --silent docker-compose.yml ~/.runner-cache/docker-compose.yml ||
bash -c 'docker-compose down
&& docker-compose build
&& docker-compose -f docker-compose.yml -f docker-compose.docker.yml up -d
&& mkdir -p ~/.runner-cache
&& rm -rf ~/.runner-cache/docker-compose.yml
&& cp docker-compose.yml ~/.runner-cache/'
- bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' 127.0.0.1:3000)" != "200" ]]; do
if [[ $i < 31 ]] ;
then i=$((i+1)) && sleep 5 && echo "slep... $i";
else exit 1; fi
; done'
- npm run service-status
- npm run lint -- --quiet
- npm run test:unit -- --forceExit
- npm run test:integration:headless
- npm run service-status
- ./scripts/checkDaos.sh
- npm run build-travis
only:
variables:
- '$CI_EXTERNAL_PULL_REQUEST_IID == null'
67 changes: 5 additions & 62 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,62 +1,5 @@
language: node_js
node_js: 12.18.4
addons:
apt:
update: true
bundler_args: "--jobs=4 --retry=3"

before_install:
- sudo apt-get install -y libsecret-1-dev curl
addons:
chrome: stable

script:
- docker -v
- docker-compose -v
# fail on error
# - set -e
- echo 'docker-compose build' && echo -en 'travis_fold:start:script.1\\r'
- docker-compose build

- echo -en 'travis_fold:end:script.1\\r'
- echo 'docker-compose up -d' && echo -en 'travis_fold:start:script.2\\r'
- docker-compose up -d
- echo -en 'travis_fold:end:script.2\\r'

# wait for alchemy (the slowest latest process to respond
- bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' 127.0.0.1:3000)" != "200" ]]; do sleep 5; done'
# prin the status of the services
- npm run service-status

# show the daos that are indexed
- ./scripts/checkDaos.sh
- echo -en 'travis_fold:end:script.4\\r'

# check lint
- npm run lint -- --quiet
# unit tests
- npm run test:unit -- --forceExit

# run integration tests
- npm run test:integration:headless

# get some diagnostic info fo debugging travis
- echo 'Debug info:' && echo -en 'travis_fold:start:script.3\\r'
- npm run service-status
- echo -en 'travis_fold:end:script.3\\r'

- ./scripts/checkDaos.sh

# see if the app builds correctly
- echo 'npm run build-travis' && echo -en 'travis_fold:start:script.4\\r'
- npm run build-travis
- echo -en 'travis_fold:end:script.4\\r'

deploy:
provider: pages
skip-cleanup: true
github-token: $GITHUB_TOKEN
keep-history: true
local-dir: dist
on:
branch: master
import:
- source: .travis/pr.yml
if: type = pull_request
- source: .travis/branch.yml
if: type = push
18 changes: 18 additions & 0 deletions .travis/branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: node_js
node_js: 12.18.4
addons:
apt:
update: true
bundler_args: "--jobs=4 --retry=3"

before_install:
- sudo apt-get install -y libsecret-1-dev curl

script:
# check lint
- npm run lint -- --quiet
# unit tests
- npm run test:unit -- --forceExit

# see if the app builds correctly
- npm run build-travis
61 changes: 61 additions & 0 deletions .travis/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
language: node_js
node_js: 12.18.4
addons:
apt:
update: true
chrome: stable
bundler_args: "--jobs=4 --retry=3"

before_install:
- sudo apt-get install -y libsecret-1-dev curl

script:
- docker -v
- docker-compose -v
# fail on error
# - set -e
- echo 'docker-compose build' && echo -en 'travis_fold:start:script.1\\r'
- docker-compose build

- echo -en 'travis_fold:end:script.1\\r'
- echo 'docker-compose up -d' && echo -en 'travis_fold:start:script.2\\r'
- docker-compose up -d
- echo -en 'travis_fold:end:script.2\\r'

# wait for alchemy (the slowest latest process to respond
- bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' 127.0.0.1:3000)" != "200" ]]; do sleep 5; done'
# prin the status of the services
- npm run service-status

# show the daos that are indexed
- ./scripts/checkDaos.sh
- echo -en 'travis_fold:end:script.4\\r'

# check lint
- npm run lint -- --quiet
# unit tests
- npm run test:unit -- --forceExit

# run integration tests
- npm run test:integration:headless

# get some diagnostic info fo debugging travis
- echo 'Debug info:' && echo -en 'travis_fold:start:script.3\\r'
- npm run service-status
- echo -en 'travis_fold:end:script.3\\r'

- ./scripts/checkDaos.sh

# see if the app builds correctly
- echo 'npm run build-travis' && echo -en 'travis_fold:start:script.4\\r'
- npm run build-travis
- echo -en 'travis_fold:end:script.4\\r'

deploy:
provider: pages
skip-cleanup: true
github-token: $GITHUB_TOKEN
keep-history: true
local-dir: dist
on:
branch: master
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
## 1.0.3
- Features Added
- Support multiple networks
- Select following and member DAOs from header
- Support an array of decimals in genericSchemeRegistry

- Improvements
- Better DAO name styles on sidebar
- Loading speed and vulnerabilities fixes
- Integration tests typescript supporting was added
- Use subgraph v41_1 and arc.js 0.2.78
- Update BalancerPoolManager.json scheme

- Bugs Fixed
- Detect wallet network change in account menu
- Show missing GP params in competition schemes
- Added missing functionality for multi-call execute calls

- Features Removed
- Feed Page

## 1.0.2
- Features Added
- Support Multi-call Generic Scheme
Expand Down
16 changes: 16 additions & 0 deletions docker-compose.docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
version: "3"
services:
alchemy:
restart: always

graph-node:
restart: always

ipfs:
restart: always

postgres:
restart: always

ganache:
restart: always
Loading

0 comments on commit e4d6899

Please sign in to comment.