Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Attempt to install codecov #543

Merged
merged 10 commits into from
Apr 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
comment:
layout: "reach, diff, flags, files"
behavior: default
require_changes: false # if true: only post the comment if coverage changes
require_base: no # [yes :: must have a base report to post]
require_head: yes # [yes :: must have a head report to post]
branches: null # branch names that can post comment
coverage:
status:
project: off
patch: off
2 changes: 0 additions & 2 deletions .coveralls.yml

This file was deleted.

5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
log/
tmp/*
tmp/**/*
coverage*
coverage/
public/warpables/*
public/system/*
public/warps/*
Expand All @@ -41,4 +41,5 @@ public/lib
node_modules
todo.txt
.sass-cache
.byebug_history
.byebug_history
coverage_report/
14 changes: 14 additions & 0 deletions .simplecov
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
require 'simplecov-cobertura'

if ENV['CI'] == 'true'
SimpleCov.formatter = SimpleCov::Formatter::CoberturaFormatter
else
SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
end

SimpleCov.start 'rails' do
add_filter '/test/'
add_filter '/db/'
add_filter '/log/'
add_filter '/tmp/'
end
4 changes: 2 additions & 2 deletions .travis.yml
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ install:
- docker-compose exec web bash -l -c "rake db:setup || rake db:migrate"

script:
- sed -ri "s/REPO_TOKEN/$REPO_TOKEN/" .coveralls.yml
- docker-compose exec web bash -l -c "CI=true TRAVIS=true rake test:all"
- bash <(curl -s https://codecov.io/bash)

branches:
only:
only:
- main
- unstable
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ group :dependencies do
gem "ruby-openid", "~>2.5"
gem "open_id_authentication"
gem "RubyInline"
gem "coveralls", require: false
gem "paperclip", "~>4.3.7"

# if you use amazon s3 for warpable image storage
Expand All @@ -40,6 +39,8 @@ group :dependencies do
end

group :test do
gem 'simplecov', require: false
gem 'simplecov-cobertura', require: false
gem 'test-unit'
end

Expand Down
14 changes: 4 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ GEM
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
concurrent-ruby (1.1.5)
coveralls (0.8.22)
json (>= 1.8, < 3)
simplecov (~> 0.16.1)
term-ansicolor (~> 1.3)
thor (~> 0.19.4)
tins (~> 1.6)
docile (1.3.1)
erubis (2.7.0)
execjs (2.7.0)
Expand Down Expand Up @@ -154,23 +148,22 @@ GEM
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-cobertura (1.3.1)
simplecov (~> 0.8)
simplecov-html (0.10.2)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.4.0)
term-ansicolor (1.7.1)
tins (~> 1.0)
test-unit (3.3.2)
power_assert
therubyracer (0.12.3)
libv8 (~> 3.16.14.15)
ref
thor (0.19.4)
tilt (1.4.1)
tins (1.20.2)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
Expand All @@ -190,7 +183,6 @@ DEPENDENCIES
autoprefixer-rails
aws-sdk (~> 1.5.7)
byebug
coveralls
friendly_id
geokit-rails (= 1.1.4)
image_science (= 1.2.6)
Expand All @@ -208,6 +200,8 @@ DEPENDENCIES
right_aws
ruby-openid (~> 2.5)
sass
simplecov
simplecov-cobertura
sprockets
sqlite3
test-unit
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## MapKnitter 2 [![Coverage Status](https://coveralls.io/repos/github/publiclab/mapknitter/badge.svg?branch=%28HEAD+detached+at+FETCH_HEAD%29)](https://coveralls.io/github/publiclab/mapknitter?branch=%28HEAD+detached+at+FETCH_HEAD%29)
## MapKnitter 2 [![Coverage Status](https://coveralls.io/repos/github/publiclab/mapknitter/badge.svg?branch=%28HEAD+detached+at+FETCH_HEAD%29)](https://coveralls.io/github/publiclab/mapknitter?branch=%28HEAD+detached+at+FETCH_HEAD%29) [![codecov](https://codecov.io/gh/publiclab/mapknitter/branch/main/graph/badge.svg)](https://codecov.io/gh/publiclab/mapknitter)

Use Public Lab's open source MapKnitter to upload your own aerial photographs (for example those from balloon or kite mapping: http://publiclab.org/balloon-mapping) and combine them into:

Expand Down
5 changes: 3 additions & 2 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require 'coveralls'
Coveralls.wear!('rails')
ENV["RAILS_ENV"] = "test"

require 'simplecov'

require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'

Expand Down