Skip to content

Commit 137d138

Browse files
committed
Merge branch 'upgrade'
2 parents 4741eaf + 9eabd12 commit 137d138

File tree

8 files changed

+11073
-5131
lines changed

8 files changed

+11073
-5131
lines changed

.github/dependabot.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "npm"
9+
directory: "/"
10+
schedule:
11+
interval: "weekly"
12+
- package-ecosystem: "github-actions"
13+
directory: "/"
14+
schedule:
15+
interval: "weekly"

.github/workflows/tests.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: "Lint"
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
7+
build-and-test:
8+
9+
strategy:
10+
matrix:
11+
node-version: ["16"]
12+
13+
name: "Lint"
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
18+
- name: "Checkout the repository"
19+
uses: actions/checkout@v3
20+
21+
- name: "Set up Node ${{ matrix.node-version }}"
22+
uses: actions/setup-node@v3
23+
with:
24+
node-version: ${{ matrix.node-version }}
25+
26+
- name: "Install dependencies"
27+
run: |
28+
npm install
29+
30+
- name: "Lint"
31+
run: |
32+
npx grunt jshint

.travis.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

Gruntfile.js

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,6 @@ module.exports = function(grunt) {
1818
}
1919
},
2020

21-
mocha_phantomjs: {
22-
all: {
23-
options: {
24-
urls: ["http://localhost:3000/"]
25-
}
26-
}
27-
},
28-
2921
jshint: {
3022
all: ["lib/*.js", "bin/*"],
3123
options: {
@@ -39,16 +31,24 @@ module.exports = function(grunt) {
3931
},
4032
serverStop: {
4133
command: "npm stop"
42-
}
34+
},
35+
runTestBrowser: {
36+
command: "xdg-open http://localhost:3000/ && sleep 5"
37+
},
4338
}
4439
});
4540

4641
grunt.loadNpmTasks("grunt-browserify");
47-
grunt.loadNpmTasks("grunt-mocha-phantomjs");
4842
grunt.loadNpmTasks("grunt-contrib-jshint");
4943
grunt.loadNpmTasks("grunt-shell");
5044

5145
grunt.registerTask("default", ["test"]);
52-
grunt.registerTask("test", "Run tests in a web browser", ["jshint", "browserify:test", "shell:serverStart", "mocha_phantomjs", "shell:serverStop"]);
46+
grunt.registerTask("test", "Run tests in a web browser", [
47+
"jshint",
48+
"browserify:test",
49+
"shell:serverStart",
50+
"shell:runTestBrowser",
51+
"shell:serverStop",
52+
]);
5353

5454
};

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
# Obsidian Project
22

3-
[![Build Status](https://travis-ci.org/wanadev/obsidian-project.svg?branch=master)](https://travis-ci.org/wanadev/obsidian-project)
43
[![NPM Version](http://img.shields.io/npm/v/obsidian-project.svg?style=flat)](https://www.npmjs.com/package/obsidian-project)
54
[![License](http://img.shields.io/npm/l/obsidian-project.svg?style=flat)](https://github.com/wanadev/obsidian-project/blob/master/LICENSE)
6-
[![Dependencies](https://img.shields.io/david/wanadev/obsidian-project.svg?maxAge=2592000)]()
7-
[![Dev Dependencies](https://img.shields.io/david/dev/wanadev/obsidian-project.svg?maxAge=2592000)]()
8-
[![Greenkeeper badge](https://badges.greenkeeper.io/wanadev/obsidian-project.svg)](https://greenkeeper.io/)
95

106

117
Documentation:
@@ -18,6 +14,7 @@ Documentation:
1814
* **[NEXT]** (changes on master but not released yet):
1915

2016
* Fixed addStructure method (@elektree, #47)
17+
* Updated dependencies (@flozz)
2118

2219
* **4.0.0:** Updates abitbol-serializable to 2.0.0
2320
* **3.2.0:** Adds history function to apply currently pointed snapshot and fixes tests

0 commit comments

Comments
 (0)