Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
rtfpessoa committed Oct 5, 2017
1 parent 564f44f commit 7c3b7a1
Show file tree
Hide file tree
Showing 13 changed files with 1,210 additions and 960 deletions.
75 changes: 75 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
version: 2
jobs:
build-common: &common-build
docker:
- image: node
working_directory: ~/diff2html
steps: &common-steps
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: npm install
- save_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
- ./node_modules
- run: npm run coverage
- run: npm run check-coverage

build-latest: &latest-build
docker:
- image: node
working_directory: ~/diff2html
steps:
- checkout
- restore_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
- run: yarn
- save_cache:
key: dependency-cache-{{ checksum "yarn.lock" }}
paths:
- ./node_modules
- run: yarn run test
- run: yarn run lint
- run: yarn run codacy

build-node_0.12:
<<: *common-build
docker:
- image: node:0.12

build-node_4:
<<: *common-build
docker:
- image: node:4

build-node_5:
<<: *common-build
docker:
- image: node:5

build-node_6:
<<: *common-build
docker:
- image: node:6

build-node_7:
<<: *common-build
docker:
- image: node:7

build-node_8:
<<: *latest-build
docker:
- image: node:8

workflows:
version: 2
build:
jobs:
- build-node_0.12
- build-node_4
- build-node_5
- build-node_6
- build-node_7
- build-node_8
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

* Before sending a pull request make sure your code is tested.

* Before sending a pull request for a feature, be sure to run tests with `npm test`.
* Before sending a pull request for a feature, be sure to run tests with `yarn test`.

* Use the same coding style as the rest of the codebase, most of the check can be performed with `npm run style`.
* Use the same coding style as the rest of the codebase, most of the check can be performed with `yarn run lint`.

* Use `git rebase` (not `git merge`) to sync your work from time to time with the master branch.

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,13 @@ If your favourite language is not included in the default package also add its j

```html
<!-- Stylesheet -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/styles/github.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css">
<link rel="stylesheet" type="text/css" href="dist/diff2html.css">

<!-- Javascripts -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.3/jquery.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.6.0/languages/scala.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>
<script type="text/javascript" src="dist/diff2html-ui.js"></script>
```

Expand Down
38 changes: 0 additions & 38 deletions circle.yml

This file was deleted.

6 changes: 3 additions & 3 deletions docs/demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<!-- Custom styles for this template -->
<link href="main.min.css" rel="stylesheet">

<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/styles/github.min.css">
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/github.min.css">

<!-- diff2html -->
<link rel="stylesheet" type="text/css" href="assets/diff2html.min.css">
Expand Down Expand Up @@ -240,8 +240,8 @@ <h3>Thank you</h3>
}
</script>

<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.9.0/languages/scala.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/languages/scala.min.js"></script>

<!-- diff2html -->
<script type="text/javascript" src="assets/diff2html.min.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion docs/demo.min.js

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions docs/main.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/main.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7c3b7a1

Please sign in to comment.