From 24d3a2b14308accee210890cc56173dc827e6d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Wed, 29 Apr 2015 18:16:51 +0200 Subject: [PATCH] reset some changes --- .coveralls.yml | 2 +- .travis.yml | 15 ++++++++++++--- Gemfile | 15 +++++++++++++++ package/yast2-registration.spec | 1 - 4 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 Gemfile diff --git a/.coveralls.yml b/.coveralls.yml index 07cb47555..91600595a 100644 --- a/.coveralls.yml +++ b/.coveralls.yml @@ -1 +1 @@ -service_name: jenkins-ci +service_name: travis-ci diff --git a/.travis.yml b/.travis.yml index 3606a8cf8..fff1b3a40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,13 @@ language: ruby -rvm: - - "2.1.0" -script: bundle exec rake -f Rakefile.travis +before_install: + # disable rvm, use system Ruby + - rvm reset + - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh + - sh ./travis_setup.sh -p "yast2-devtools yast2 yast2-slp yast2-add-on" -g bundler +script: + - rake check:pot + - rubocop + - yardoc + - COVERAGE=1 bundle exec rake test:unit + - sudo rake install + diff --git a/Gemfile b/Gemfile new file mode 100644 index 000000000..8b59e56e1 --- /dev/null +++ b/Gemfile @@ -0,0 +1,15 @@ +source "https://rubygems.org" + +# FIXME: use a correct branch here... +gem "suse-connect", github: "SUSE/connect", branch: "v0.2.14" + +group :test do + gem "rake" + gem "yard" + gem "yast-rake", ">= 0.1.9" + gem "rspec", "~> 2.14.0" + gem "gettext", require: false + gem "rubocop", "~> 0.29.1", require: false + gem "simplecov", require: false + gem "coveralls", require: false if ENV["TRAVIS"] +end diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec index 9cd37f375..269d9bcca 100644 --- a/package/yast2-registration.spec +++ b/package/yast2-registration.spec @@ -74,7 +74,6 @@ Authors: %build %check -host coveralls.io %if 0%{?run_ci_tests} LC_ALL=en_US.UTF-8 COVERALLS_REPO_TOKEN=%{coveralls_repo_token} \ CI_NAME=jenkins-ci CI_BUILD_NUMBER=%{ci_build_number} \