Skip to content

Commit ed6bed6

Browse files
authored
Merge pull request #179 from ActivityWatch/github-actions
Switched to GitHub actions
2 parents f3fcb20 + 4421d89 commit ed6bed6

File tree

10 files changed

+509
-33
lines changed

10 files changed

+509
-33
lines changed

.github/workflows/nodejs.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: Node
5+
6+
on:
7+
push:
8+
branches: [ master ]
9+
pull_request:
10+
branches: [ master ]
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
16+
strategy:
17+
matrix:
18+
node-version: [12.x]
19+
20+
steps:
21+
- uses: actions/checkout@v2
22+
with:
23+
submodules: 'recursive'
24+
- name: Use Node.js ${{ matrix.node-version }}
25+
uses: actions/setup-node@v1
26+
with:
27+
node-version: ${{ matrix.node-version }}
28+
- name: Install
29+
run: npm ci
30+
- name: Build
31+
run: npm run build
32+
- name: Run tests
33+
run: npm test
34+
- name: Serve webui
35+
run: npm run serve &
36+
- name: Run e2e tests with testcafe
37+
uses: DevExpress/testcafe-action@latest
38+
with:
39+
args: "chrome test/e2e/"
40+
- name: Upload screenshots
41+
uses: actions/upload-artifact@v2-preview
42+
with:
43+
name: screenshots
44+
path: screenshots/*
45+
46+

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ test/unit/coverage
77
test/e2e/reports
88
*.swp
99
__pycache__
10+
screenshots

.travis.yml

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

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
.PHONY: install build dev test clean aw-client-js
1+
.PHONY: install build dev test clean
22

33
.FORCE: ;
44

55
build: install
66
npm run build
77

8-
install: aw-client-js
9-
npm install
8+
install:
9+
npm ci
1010

1111
uninstall:
1212
rm -r node_modules/
@@ -17,6 +17,9 @@ dev:
1717
test:
1818
npm test
1919

20+
test-e2e:
21+
testcafe firefox test/e2e/
22+
2023
clean:
2124
rm -rf node_modules dist
2225

@@ -25,6 +28,3 @@ lint:
2528

2629
lint-fix:
2730
npx eslint --ext=js,ts,vue --fix src/
28-
29-
aw-client-js:
30-
make --directory=aw-client-js build

0 commit comments

Comments
 (0)