Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
shuse2 committed Jan 17, 2020
2 parents 1fb235e + 0299fbd commit 06fb17c
Show file tree
Hide file tree
Showing 1,040 changed files with 170,509 additions and 114,952 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["lisk-base"],
"extends": ["lisk-base/base"],
"rules": {
"implicit-arrow-linebreak": "off",
"no-mixed-spaces-and-tabs": "off",
Expand Down
16 changes: 0 additions & 16 deletions .github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_BUG_REPORT.md

This file was deleted.

22 changes: 0 additions & 22 deletions .github/ISSUE_TEMPLATE/ISSUE_TEMPLATE_FEATURE.md

This file was deleted.

1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Create a report to help us improve
title: ''
labels: 'type: bug'
assignees: ''

---

### Expected behavior
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ about: Propose an idea for new improvements/features
title: ''
labels: ''
assignees: ''

---

### Description
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ browsertest/browsertest.js
browsertest/browsertest.min.js
browsertest/src
browsertest/test
tsconfig.tsbuildinfo

# Unsupported lock files
yarn.lock
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.18.0
12.14.1
20 changes: 9 additions & 11 deletions Jenkinsfile.sdk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ def setup(start_application=false) {
# teardown_*() should have killed all node processes but we want to be sure
# this shouldn't hurt assuming the 'lisk-core' jenkins nodes have 1 executor
killall --verbose --wait node || true
dropdb --if-exists lisk_dev
for database in $( psql --tuples-only --command='SELECT datname FROM pg_database WHERE datdba = (SELECT usesysid FROM pg_user WHERE usename = current_user);' |awk '{ print $1 }' ); do
dropdb --if-exists $database
done
createdb lisk_dev
NODE_ENV=test LISK_CONSOLE_LOG_LEVEL=debug NEWRELIC_LICENSE_KEY= node test/test_app >.app.log 2>&1 &
'''
Expand Down Expand Up @@ -149,7 +151,6 @@ pipeline {
npm ci
npm run bootstrap -- --ci
npm run build
npm run lint
# needed by one of the "Functional HTTP GET tests"
git rev-parse HEAD > framework/REVISION
'''
Expand Down Expand Up @@ -182,11 +183,7 @@ pipeline {
// Save all the test results
sh '''
rm -rf coverage_elements; mkdir -p coverage_elements
for d in elements/*; do
if [ -d $d ] && [ -d $d/.nyc_output ]; then
cp -r $d/.nyc_output/* ./coverage_elements
fi
done
cp -rf elements/*/.nyc_output/* elements/*/.coverage/* coverage_elements/
'''
stash name: "coverage_elements", includes: "coverage_elements/*", allowEmpty: true
}
Expand Down Expand Up @@ -314,13 +311,14 @@ pipeline {
}
}
}
stage('Integation tests') {
stage('Integration tests') {
agent { node { label 'lisk-framework' }}
options {
timeout(time: 10, unit: 'MINUTES')
}
steps {
setup()
timeout(10) {
run_mocha('integration')
}
run_mocha('integration')
}
post {
cleanup {
Expand Down
54 changes: 54 additions & 0 deletions Jenkinsfile.sonar
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
@Library('lisk-jenkins') _

pipeline {
agent { node { label 'lisk-sdk' } }
stages {
stage('Install TypeScript') {
steps {
nvm(getNodejsVersion()) {
sh 'npm ci'
}
}
}
stage('Run sonar-scanner') {
steps {
nvm(getNodejsVersion()) {
script {
def scannerHome = tool 'sonar';
withSonarQubeEnv() {
if (env.CHANGE_ID) {
sh """#!/bin/bash
${scannerHome}/bin/sonar-scanner -Dsonar.projectKey=LiskHQ_lisk-sdk \
-Dsonar.organization=liskhq \
-Dsonar.exclusions=**/test/**,**/migrations/**,reset_mem_tables.sql,**/protocol-specs/**,**/templates/browsertest.tmpl/**,**/lisk-p2p/examples/** \
-Dsonar.scm.revision=$GIT_COMMIT \
-Dsonar.projectVersion=\${GIT_COMMIT::7} \
-Dsonar.pullrequest.key=$CHANGE_ID \
-Dsonar.pullrequest.branch=$CHANGE_BRANCH \
-Dsonar.pullrequest.base=$CHANGE_TARGET \
-Dsonar.typescript.tsconfigPath=tsconfig.json
"""
} else {
sh """#!/bin/bash
${scannerHome}/bin/sonar-scanner -Dsonar.projectKey=LiskHQ_lisk-sdk \
-Dsonar.organization=liskhq \
-Dsonar.exclusions=**/test/**,**/migrations/**,reset_mem_tables.sql,**/protocol-specs/**,**/templates/browsertest.tmpl/**,**/lisk-p2p/examples/** \
-Dsonar.scm.revision=$GIT_COMMIT \
-Dsonar.projectVersion=\${GIT_COMMIT::7} \
-Dsonar.branch.name=$GIT_BRANCH \
-Dsonar.typescript.tsconfigPath=tsconfig.json
"""
}
}
}
}
}
}
}
post {
cleanup {
cleanWs()
}
}
}
// vim: filetype=groovy
2 changes: 2 additions & 0 deletions commander/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
LICENSE
.gitkeep
mocha.opts
tsconfig.tsbuildinfo

# rc files
.*rc
Expand All @@ -20,3 +21,4 @@ mocha.opts
.nyc_output/
coverage/
dist/
tmp/
24 changes: 7 additions & 17 deletions commander/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,13 @@ $ npm test

## Get Involved

| Reason | How |
| -------------------------------- | ---------------------------------------------------------------------------------------------- |
| Want to chat with our community | [Chat with them on Lisk.chat](http://lisk.chat) |
| Want to chat with our developers | [Chat with them on Gitter](https://gitter.im/LiskHQ/lisk) |
| Found a bug | [Open a new issue](https://github.com/LiskHQ/lisk/issues/new) |
| Found a security issue | [See our bounty program](https://blog.lisk.io/announcing-lisk-bug-bounty-program-5895bdd46ed4) |
| Want to share your research | [Propose your research](https://research.lisk.io) |
| Want to develop with us | [Create a fork](https://github.com/LiskHQ/lisk/fork) |
| Reason | How |
| ------------------------------- | ---------------------------------------------------------------------------------------------- |
| Want to chat with our community | [Reach them on Discord](https://discord.gg/lisk) |
| Found a bug | [Open a new issue](https://github.com/LiskHQ/lisk/issues/new) |
| Found a security issue | [See our bounty program](https://blog.lisk.io/announcing-lisk-bug-bounty-program-5895bdd46ed4) |
| Want to share your research | [Propose your research](https://research.lisk.io) |
| Want to develop with us | [Create a fork](https://github.com/LiskHQ/lisk/fork) |

## License

Expand All @@ -80,12 +79,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

---

[bugs]: https://github.com/LiskHQ/lisk-commander/issues
[contribution guidelines]: docs/CONTRIBUTING.md
[gitter]: https://gitter.im/LiskHQ/lisk
[license]: https://github.com/LiskHQ/lisk-commander/tree/master/LICENSE
[lisk chat]: https://lisk.chat/home
[nvm]: https://github.com/creationix/nvm
Loading

0 comments on commit 06fb17c

Please sign in to comment.