summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml42
-rw-r--r--README.md2
2 files changed, 2 insertions, 42 deletions
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 51076237fba..00000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-language: ruby
-cache:
- directories:
- - vendor/bundle
-env:
- global:
- - TRAVIS=true
- matrix:
- - TASK=spinach_project DB=mysql
- - TASK=spinach_other DB=mysql
- - TASK=spec:api DB=mysql
- - TASK=spec:feature DB=mysql
- - TASK=spec:other DB=mysql
- - TASK=jasmine:ci DB=mysql
- - TASK=spinach_project DB=postgresql
- - TASK=spinach_other DB=postgresql
- - TASK=spec:api DB=postgresql
- - TASK=spec:feature DB=postgresql
- - TASK=spec:other DB=postgresql
- - TASK=jasmine:ci DB=postgresql
-before_install:
- - sudo apt-get install libicu-dev -y
-install:
- - "travis_retry bundle config build.nokogiri --use-system-libraries"
- - "travis_retry bundle install --deployment --without production --retry 5"
-branches:
- only:
- - 'master'
-rvm:
- - 2.0.0
-services:
- - redis-server
-before_script:
- - "cp config/database.yml.$DB config/database.yml"
- - "cp config/gitlab.yml.example config/gitlab.yml"
- - "bundle exec rake db:setup"
- - "bundle exec rake db:seed_fu"
-script: "bundle exec rake $TASK --trace"
-notifications:
- email: false
-git:
- depth: 10
diff --git a/README.md b/README.md
index 6d87f314720..f3225889252 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,8 @@
- [![build status](https://ci.gitlab.org/projects/1/status.png?ref=master)](https://ci.gitlab.org/projects/1?ref=master) on ci.gitlab.org (master branch)
+- [![Build Status](https://semaphoreapp.com/api/v1/projects/2f1a5809-418b-4cc2-a1f4-819607579fe7/243338/badge.png)](https://semaphoreapp.com/gitlabhq/gitlabhq)
+
- [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
- [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq)