Permalink
Browse files

Update the CI configuration

* Cut out the beta OS X builds on Travis-CI
* Use the official script for AppVeyor
* Use a clone of hte official script for CircleCI
  • Loading branch information...
1 parent 7b9ba39 commit 0053b31ead4722cb03f65bd3932fd15a0b4997c4 @Arcanemagus Arcanemagus committed Sep 12, 2016
Showing with 38 additions and 40 deletions.
  1. +18 −13 .travis.yml
  2. +15 −14 appveyor.yml
  3. +5 −13 circle.yml
View
@@ -1,23 +1,32 @@
-# Project specific config
+### Project specific config ###
language: generic
-os:
- - linux
- - osx
+matrix:
+ include:
+ - os: linux
+ env: ATOM_CHANNEL=stable
-env:
- matrix:
- - ATOM_CHANNEL=stable
- - ATOM_CHANNEL=beta
+ - os: linux
+ env: ATOM_CHANNEL=beta
-# Generic setup follows
+ - os: osx
+ env: ATOM_CHANNEL=stable
+
+### Generic setup follows ###
script: 'curl -s https://raw.githubusercontent.com/atom/ci/master/build-package.sh | sh'
+# Needed to disable the auto-install step running `npm install`
+install: true
+
notifications:
email:
on_success: never
on_failure: change
+branches:
+ only:
+ - master
+
git:
depth: 10
@@ -30,7 +39,3 @@ addons:
- git
- libgnome-keyring-dev
- fakeroot
-
-branches:
- only:
- - master
View
@@ -1,19 +1,20 @@
-version: "{build}"
-os: Windows Server 2012 R2
+### Project specific config ###
+environment:
+ matrix:
+ - ATOM_CHANNEL: stable
+ - ATOM_CHANNEL: beta
+
+### Generic setup follows ###
+build_script:
+ - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))
+
branches:
only:
- master
+
+version: "{build}"
+platform: x64
+clone_depth: 10
+skip_tags: true
test: off
deploy: off
-
-install:
- - appveyor DownloadFile https://atom.io/download/windows -FileName AtomSetup.exe
- - AtomSetup.exe /silent
-
-build_script:
- - cd %APPVEYOR_BUILD_FOLDER%
- - SET PATH=%LOCALAPPDATA%\atom\bin;%PATH%
- - apm -v
- - apm clean
- - apm install
- - apm test
View
@@ -1,15 +1,7 @@
-dependencies:
- override:
- - curl -L https://atom.io/download/deb -o atom-amd64.deb
- - sudo dpkg --install atom-amd64.deb || true
- - sudo apt-get update
- - sudo apt-get -f install -y
- - apm install
test:
override:
- - atom -v
- - apm -v
- - ./node_modules/.bin/eslint src
- - ./node_modules/.bin/eslint spec
- - ./node_modules/.bin/eslint lib
- - apm test
+ - curl -s https://raw.githubusercontent.com/Arcanemagus/ci/atomlinter/build-package.sh | sh
+
+dependencies:
+ override:
+ - echo "Managed in the script"

0 comments on commit 0053b31

Please sign in to comment.