Merge pull request electron#11297 from electron/remove-travis

Remove Travis references
asd281533890 · Dec 4, 2017 · 3e056ee · 3e056ee
2 parents e989005 + 1989075
commit 3e056ee
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 1,114 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 .DS_Store
 .env
 .gclient_done
-.npmrc
+**/.npmrc
 .tags*
 .vs/
 .vscode/
@@ -41,8 +41,8 @@
 /vendor/download/
 /vendor/llvm-build/
 /vendor/llvm/
-/vendor/node/deps/node-inspect/.npmrc
 /vendor/npm/
 /vendor/python_26/
 node_modules/
 SHASUMS256.txt
+**/package-lock.json
diff --git a/README.md b/README.md
@@ -1,7 +1,9 @@
 [![Electron Logo](https://electronjs.org/images/electron-logo.svg)](https://electronjs.org)
 
-[![Travis Build Status](https://travis-ci.org/electron/electron.svg?branch=master)](https://travis-ci.org/electron/electron)
-[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/bc56v83355fi3369/branch/master?svg=true)](https://ci.appveyor.com/project/electron-bot/electron/branch/master)
+
+[![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/master.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/master)
+[![AppVeyor Build Status](https://windows-ci.electronjs.org/api/projects/status/nilyf07hcef14dvj/branch/master?svg=true)](https://windows-ci.electronjs.org/project/AppVeyor/electron/branch/master)
+[![Jenkins Build Status](https://mac-ci.electronjs.org/buildStatus/icon?job=Electron%20org/electron/master)](https://mac-ci.electronjs.org/blue/organizations/jenkins/Electron%20org%2Felectron/activity?branch=master)
 [![devDependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron?type=dev)
 [![Join the Electron Community on Slack](https://atom-slack.herokuapp.com/badge.svg)](https://atom-slack.herokuapp.com/)
 

diff --git a/script/cibuild b/script/cibuild
@@ -57,19 +57,6 @@ def main():
   if os.environ.has_key('TARGET_ARCH'):
     target_arch = os.environ['TARGET_ARCH']
 
-  is_travis = (os.getenv('TRAVIS') == 'true')
-  if is_travis and PLATFORM == 'linux':
-    print 'Setup travis CI'
-    execute(['sudo', 'apt-get', 'update'])
-    deps = LINUX_DEPS
-    if target_arch == 'arm':
-      deps += LINUX_DEPS_ARM
-    elif target_arch == 'arm64':
-      deps += LINUX_DEPS_ARM64
-    else:
-      deps += LINUX_DEPS_NO_ARM
-    execute(['sudo', 'apt-get', 'install'] + deps)
-
   if PLATFORM == 'linux' and target_arch == 'x64':
     os.environ['DISPLAY'] = ':99.0'
     execute(['sh', '-e', '/etc/init.d/xvfb', 'start'])

diff --git a/spec/api-crash-reporter-spec.js b/spec/api-crash-reporter-spec.js
@@ -55,7 +55,6 @@ describe('crashReporter module', () => {
       it('should send minidump when renderer crashes', function (done) {
         // TODO(alexeykuzmin): Skip the test instead of marking it as passed.
         if (process.env.APPVEYOR === 'True') return done()
-        if (process.env.TRAVIS === 'true') return done()
 
         this.timeout(180000)
 
@@ -76,7 +75,6 @@ describe('crashReporter module', () => {
       it('should send minidump when node processes crash', function (done) {
         // TODO(alexeykuzmin): Skip the test instead of marking it as passed.
         if (process.env.APPVEYOR === 'True') return done()
-        if (process.env.TRAVIS === 'true') return done()
 
         this.timeout(180000)
 
@@ -172,7 +170,6 @@ describe('crashReporter module', () => {
       it('should send minidump with updated extra parameters', function (done) {
         // TODO(alexeykuzmin): Skip the test instead of marking it as passed.
         if (process.env.APPVEYOR === 'True') return done()
-        if (process.env.TRAVIS === 'true') return done()
 
         this.timeout(180000)
 
@@ -261,11 +258,9 @@ describe('crashReporter module', () => {
 
   describe('getLastCrashReport', () => {
     it('correctly returns the most recent report', () => {
-      if (process.env.TRAVIS === 'False') {
-        const reports = crashReporter.getUploadedReports()
-        const lastReport = reports[0]
-        assert(lastReport != null)
-      }
+      const reports = crashReporter.getUploadedReports()
+      const lastReport = reports[0]
+      assert(lastReport != null)
     })
   })
 

diff --git a/spec/api-protocol-spec.js b/spec/api-protocol-spec.js
@@ -686,12 +686,6 @@ describe('protocol module', () => {
     })
 
     it('sends error when callback is called with nothing', function (done) {
-      if (process.env.TRAVIS === 'true') {
-        // FIXME(alexeykuzmin): Skip the test.
-        // this.skip()
-        return done()
-      }
-
       protocol.interceptBufferProtocol('http', emptyHandler, (error) => {
         if (error) return done(error)
         $.ajax({

diff --git a/spec/chromium-spec.js b/spec/chromium-spec.js
@@ -30,12 +30,6 @@ describe('chromium feature', () => {
 
   describe('heap snapshot', () => {
     it('does not crash', function () {
-      if (process.env.TRAVIS === 'true') {
-        // FIXME(alexeykuzmin): Skip the test.
-        // this.skip()
-        return
-      }
-
       process.atomBinding('v8_util').takeHeapSnapshot()
     })
   })
@@ -173,12 +167,6 @@ describe('chromium feature', () => {
   })
 
   describe('window.open', () => {
-    before(function () {
-      if (process.env.TRAVIS === 'true' && process.platform === 'darwin') {
-        this.skip()
-      }
-    })
-
     it('returns a BrowserWindowProxy object', () => {
       const b = window.open('about:blank', '', 'show=no')
       assert.equal(b.closed, false)

diff --git a/spec/node-spec.js b/spec/node-spec.js
@@ -135,12 +135,6 @@ describe('node feature', () => {
 
   describe('contexts', () => {
     describe('setTimeout in fs callback', () => {
-      before(function () {
-        if (process.env.TRAVIS === 'true') {
-          this.skip()
-        }
-      })
-
       it('does not crash', (done) => {
         fs.readFile(__filename, () => {
           setTimeout(done, 0)