Skip to content

Commit

Permalink
Replace travis (#296)
Browse files Browse the repository at this point in the history
* Add Jenkinsfile

* Prepare node container

* Use function for CI build for JS libs

* Create coverage report for regular test execution

* Add sonar to same workspace as tests

* Improve sonar config

* Fix some of the sonar issues and add sonar to gitignore

* Remove travis.yml

* Switch to master pipeline

* Add Env var for junit report
  • Loading branch information
TheBay0r authored Apr 24, 2018
1 parent d111937 commit 54ff036
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 13,785 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ dist

# IDEs
.idea

# Sonar
.scannerwork
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

18 changes: 18 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
@Library("kununu") _

withEnv([
"SERVICE_NAME=nukleus",
"COVERAGE_DIR_EXPORT=/app/coverage",
"LOG_JUNIT_EXPORT=/app/coverage/junit.xml"
]) {
ansiColor {
timestamps {
defaultPipeline.getSource()
defaultPipeline.prepareNodeContainer()
defaultPipeline.runJsLint()
defaultPipeline.runJslibTests()
defaultPipeline.runSonar("js")
defaultPipeline.destroyNodeContainer()
}
}
}
2 changes: 1 addition & 1 deletion components/MultipleChoice/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
input {
display: block;
position: absolute;
margin-left: 4px 0 0;
margin-left: 4px;
opacity: 0;
z-index: -1;

Expand Down
2 changes: 1 addition & 1 deletion components/Paginator/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export default class Paginator extends React.Component {
} = this.props;

const currentPage = Number(query[queryKey]) || 1;
const totalPagesArray = this.getPageRange(currentPage, totalPages);
const totalPagesArray = this.getPageRange(currentPage);
const previousPage = currentPage !== 1 ? currentPage - 1 : currentPage;
const nextPage = currentPage !== totalPages ? currentPage + 1 : currentPage;

Expand Down
4 changes: 2 additions & 2 deletions components/Select/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,14 @@ export default class Select extends React.Component {

const allOptions = (Object.keys(options).length && options) || items;

let mappedOptions = Object.keys(allOptions)
const mappedOptions = Object.keys(allOptions)
.map(key => ({
key: (allOptions)[key].key || key,
value: (allOptions)[key].value || (allOptions)[key]
}));

if (sort) {
mappedOptions = mappedOptions.sort(sort);
mappedOptions.sort(sort);
}

return (
Expand Down
Loading

0 comments on commit 54ff036

Please sign in to comment.