Skip to content

Commit abdf49e

Browse files
committed
Merge branch 'release/v1.3.1'
2 parents fa2ad38 + 8bd424d commit abdf49e

34 files changed

+1223
-471
lines changed

.build/run_linux.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
echo $PWD
5+
6+
docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${NODE_VERSION}"

.build/run_osx.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
echo $PWD
5+
6+
npm ci
7+
npm run compile
8+
npm test

.build/setup_linux.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
5+
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
6+
sudo apt-get update
7+
sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
8+
docker pull s1hofmann/nut-ci:latest
9+
docker run -it -d --name nut-ci --user $(id -u):$(id -g) -v ${PWD}:${PWD}:rw s1hofmann/nut-ci:latest bash

.build/setup_osx.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/usr/bin/env bash
2+
set -e

.travis.yml

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
os: linux
2-
dist: xenial
3-
4-
language: node_js
5-
node_js:
6-
- "lts/dubnium"
71
cache: npm
82

93
addons:
@@ -15,19 +9,42 @@ addons:
159
services:
1610
- docker
1711

18-
before_install:
19-
# Update Docker
20-
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
21-
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
22-
- sudo apt-get update
23-
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
24-
- docker pull s1hofmann/nut-ci:latest
25-
- docker run -it -d --name nut-ci --user $(id -u):$(id -g) -v ${PWD}:${PWD}:rw s1hofmann/nut-ci:latest bash
12+
matrix:
13+
include:
14+
- name: "Linux Node 10"
15+
os: linux
16+
dist: xenial
17+
env: NODE_VERSION=10
18+
- name: "Linux Node 11"
19+
os: linux
20+
dist: xenial
21+
env: NODE_VERSION=11
22+
- name: "Linux Node 12"
23+
os: linux
24+
dist: xenial
25+
env: NODE_VERSION=12
26+
- name: "macOS Node 10"
27+
os: osx
28+
osx_image: xcode11
29+
language: node_js
30+
node_js: "10"
31+
- name: "macOS Node 11"
32+
os: osx
33+
osx_image: xcode11
34+
language: node_js
35+
node_js: "11"
36+
- name: "macOS Node 12"
37+
os: osx
38+
osx_image: xcode11
39+
language: node_js
40+
node_js: "12"
2641

42+
before_install:
43+
- "bash ./.build/setup_${TRAVIS_OS_NAME}.sh"
2744
install: true
2845

2946
script:
30-
- travis_retry docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} lts/dubnium"
47+
- "bash ./.build/run_${TRAVIS_OS_NAME}.sh"
3148

3249
after_success:
3350
- sonar-scanner

appveyor.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
platform:
2+
- x64
3+
4+
image:
5+
- Visual Studio 2017
6+
7+
init:
8+
- git config --global core.autocrlf true
9+
10+
environment:
11+
matrix:
12+
- nodejs_version: "10"
13+
- nodejs_version: "11"
14+
- nodejs_version: "12"
15+
16+
clone_folder: c:\projects\nut
17+
18+
install:
19+
- ps: Install-Product node $env:nodejs_version x64
20+
- node --version
21+
- cd c:\projects\nut
22+
- npm ci
23+
- npm run compile
24+
25+
build: off
26+
27+
test_script:
28+
- npm test

lib/provider/native/robotjs-keyboard-action.class.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import robot = require("robotjs-node10");
1+
import robot = require("@nut-tree/libnut");
22
import { Key } from "../../key.enum";
33
import { KeyboardActionProvider } from "./keyboard-action-provider.interface";
44

lib/provider/native/robotjs-keyboard.action.class.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import robot = require("robotjs-node10");
1+
import robot = require("@nut-tree/libnut");
22
import { Key } from "../../key.enum";
33
import { KeyboardAction } from "./robotjs-keyboard-action.class";
44

5-
jest.mock("robotjs-node10");
5+
jest.mock("@nut-tree/libnut");
66

77
beforeEach(() => {
88
jest.resetAllMocks();

0 commit comments

Comments
 (0)