diff --git a/.ruby-version b/.ruby-version index ecd7ee50..338a5b5d 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.8 +2.6.6 diff --git a/.travis.yml b/.travis.yml index 6d3ac828..a94c68ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ -sudo: required -dist: xenial +language: ruby +cache: bundler +rvm: + - 2.6.6 +dist: bionic addons: apt: packages: - chromium-browser -language: ruby -cache: bundler -rvm: - - 2.5 - - 2.6 +services: + - postgresql branches: except: - /^depfu/.*$/ @@ -26,16 +26,29 @@ notifications: on_success: change on_failure: change before_script: + # install CodeClimate test reporter and tell it we are starting a test run + # - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > $CCTR + # - chmod +x $CCTR + # - $CCTR before-build - RAILS_ENV=test bundle exec rake db:bootstrap --trace - RAILS_ENV=test bundle exec bin/rails webdrivers:chromedriver:update script: - - "./travis_script.sh $TEST_SUITE" + - "bin/travis_script.sh $TEST_SUITE" + # TODO Get this working. + # - $CCTR format-coverage -t simplecov --output coverage/codeclimate.$SUITE.json +# after_script: + # combine coverage from all suites, and upload3 to CodeClimate + # - $CCTR sum-coverage coverage/codeclimate.*.json | $CCTR upload-coverage + # - $CCTR after-build --exit-code $TRAVIS_TEST_RESULT + env: global: - OSEM_DB_ADAPTER=sqlite3 - OSEM_DB_HOST='' - OSEM_DB_PORT='' - OSEM_DB_NAME='osem_test' + - CC_TEST_REPORTER_ID=$CC_TEST_REPORTER + - CCTR=./cc-test-reporter matrix: - TEST_SUITE=ability - TEST_SUITE=features diff --git a/Gemfile b/Gemfile index 77ac5a7e..5877787b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' -# ruby '~> 2.5.0' +ruby ENV['TRAVIS_RUBY_VERSION'] || '2.6.6' # rails-assets requires >= 1.8.4 if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4') diff --git a/Gemfile.lock b/Gemfile.lock index 241cbb00..929552b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -784,5 +784,8 @@ DEPENDENCIES webmock whenever +RUBY VERSION + ruby 2.6.6p146 + BUNDLED WITH 1.17.3 diff --git a/README.md b/README.md index 2fe87dcf..489b10b9 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,16 @@ -[![Build Status](https://travis-ci.org/openSUSE/osem.svg?branch=master)](https://travis-ci.org/openSUSE/osem) -[![Code Climate](https://codeclimate.com/github/openSUSE/osem.png)](https://codeclimate.com/github/openSUSE/osem) -[![codecov](https://codecov.io/gh/opensuse/osem/branch/master/graph/badge.svg)](https://codecov.io/gh/opensuse/osem) -[![Security Status](https://hakiri.io/github/openSUSE/osem/master.svg)](https://hakiri.io/github/openSUSE/osem/master) -[![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/openSUSE/osem) - +[![Build Status](https://travis-ci.com/snap-cloud/snapcon.svg?branch=master)](https://travis-ci.com/snap-cloud/snapcon) +[![Maintainability](https://api.codeclimate.com/v1/badges/b7b0d559a03bf218663a/maintainability)](https://codeclimate.com/github/snap-cloud/snapcon/maintainability) +[![Test Coverage](https://api.codeclimate.com/v1/badges/b7b0d559a03bf218663a/test_coverage)](https://codeclimate.com/github/snap-cloud/snapcon/test_coverage) +[![codecov](https://codecov.io/gh/snap-cloud/snapcon/branch/master/graph/badge.svg)](https://codecov.io/gh/snap-cloud/snapcon) +[![Security Status](https://hakiri.io/github/snap-cloud/snapcon/master.svg)](https://hakiri.io/github/snap-cloud/snapcon/master) +[![Dependencies](https://badges.depfu.com/badges/8fcd630367d20f5b48d393774c00c5fd/overview.svg)](https://depfu.com/repos/snap-cloud/snapcon) + Deploy -# Open Source Event Manager - [osem.io](https://osem.io) + +# [Snap!Con](https://snapcon.org) +forked from: +## Open Source Event Manager - [osem.io](https://osem.io) ![OSEM Logo](doc/osem-logo.png) An event management tool tailored to Free and Open Source Software conferences. diff --git a/travis_script.sh b/bin/travis_script.sh similarity index 100% rename from travis_script.sh rename to bin/travis_script.sh