From 886d7efaa47c9dd55ce40c419419d255313fdc71 Mon Sep 17 00:00:00 2001 From: Pierre Vanduynslager Date: Thu, 15 Feb 2018 13:54:12 -0500 Subject: [PATCH] Use official Atom CI scripts --- .travis.yml | 25 ++++++++++++++----------- package.json | 2 -- spec.js => spec/linter-xo.js | 4 ++-- 3 files changed, 16 insertions(+), 15 deletions(-) rename spec.js => spec/linter-xo.js (98%) diff --git a/.travis.yml b/.travis.yml index ca4ed86..6266cda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,15 @@ -language: node_js -node_js: - - 'node' -before_script: - - bash <(curl -s https://raw.githubusercontent.com/wooorm/atom-travis/master/install.sh) - - export DISPLAY=":99" +language: generic +os: linux script: - - npm test - - npm run rebuild - - apm test -env: - - CC=clang CXX=clang++ npm_config_clang=1 + - curl -s -O https://raw.githubusercontent.com/atom/ci/master/build-package.sh + - chmod u+x build-package.sh + - ./build-package.sh + - npm rebuild + - npm run test +addons: + apt: + packages: + - build-essential + - fakeroot + - git + - libsecret-1-dev diff --git a/package.json b/package.json index aa27985..75e0043 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "scripts": { "lint": "xo --ignore='mocks/**/*'", "pretest": "npm run lint", - "rebuild": "electron-rebuild -v $(atom -v | grep Electron | sed -e 's/^Electron: //')", "test": "ava" }, "keywords": [ @@ -40,7 +39,6 @@ "devDependencies": { "ava": "^0.19.1", "babel-register": "^6.18.0", - "electron-rebuild": "^1.4.0", "proxyquire": "^1.7.10", "text-buffer": "^11.4.0", "tmp": "0.0.31" diff --git a/spec.js b/spec/linter-xo.js similarity index 98% rename from spec.js rename to spec/linter-xo.js index b0613b2..8f698ae 100644 --- a/spec.js +++ b/spec/linter-xo.js @@ -1,8 +1,8 @@ /** @babel */ /* eslint-env atom, jasmine */ /* global waitsForPromise */ -import {files} from './mocks'; -import {provideLinter} from '.'; +import {files} from '../mocks'; +import {provideLinter} from '..'; describe('xo provider for linter', () => { const {lint} = provideLinter();