Skip to content

Commit 8f3b8bd

Browse files
committed
(#13) Working on Linux and macOS matrix build
1 parent 2d2a0c1 commit 8f3b8bd

File tree

1 file changed

+26
-18
lines changed

1 file changed

+26
-18
lines changed

.travis.yml

+26-18
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:
@@ -17,26 +11,40 @@ services:
1711

1812
matrix:
1913
include:
20-
- name: "Node 10"
14+
- name: "Linux Node 10"
15+
os: linux
16+
dist: xenial
2117
env: NODE_VERSION=10
22-
- name: "Node 11"
18+
- name: "Linux Node 11"
19+
os: linux
20+
dist: xenial
2321
env: NODE_VERSION=11
24-
- name: "Node 12"
22+
- name: "Linux Node 12"
23+
os: linux
24+
dist: xenial
2525
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

2742
before_install:
28-
# Update Docker
29-
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
30-
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
31-
- sudo apt-get update
32-
- sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
33-
- docker pull s1hofmann/nut-ci:latest
34-
- docker run -it -d --name nut-ci --user $(id -u):$(id -g) -v ${PWD}:${PWD}:rw s1hofmann/nut-ci:latest bash
35-
43+
- "bash ./build/setup_${TRAVIS_OS_NAME}.sh"
3644
install: true
3745

3846
script:
39-
- travis_retry docker exec nut-ci bash -c "bash $PWD/.build/build.sh ${PWD} ${NODE_VERSION}"
47+
- "bash ./build/run_${TRAVIS_OS_NAME}.sh"
4048

4149
after_success:
4250
- sonar-scanner

0 commit comments

Comments
 (0)