Skip to content

Commit

Permalink
reset some changes
Browse files Browse the repository at this point in the history
  • Loading branch information
lslezak committed Apr 29, 2015
1 parent 435ebf8 commit 24d3a2b
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .coveralls.yml
@@ -1 +1 @@
service_name: jenkins-ci
service_name: travis-ci
15 changes: 12 additions & 3 deletions .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

15 changes: 15 additions & 0 deletions 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
1 change: 0 additions & 1 deletion package/yast2-registration.spec
Expand Up @@ -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} \
Expand Down

0 comments on commit 24d3a2b

Please sign in to comment.