Skip to content

Commit

Permalink
Merge branch 'bsc-968192' into bsc-968192-master
Browse files Browse the repository at this point in the history
* bsc-968192:
  Remove obsolete comment
  Update from code review
  Add coveralls configuration
  Refactor SystemSettings module
  Add some unit test to SystemSettings
  Bump version and update changes file
  Prevent scheduler settings to be removed
  adapt Rakefile to submit to correct build service project in maintenance branch SLE-12-SP1
  • Loading branch information
imobachgs committed Jul 13, 2016
2 parents dc1a0a0 + cf4c371 commit 292a6f3
Show file tree
Hide file tree
Showing 7 changed files with 631 additions and 156 deletions.
1 change: 1 addition & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
service_name: travis-ci
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ before_install:
# disable rvm, use system Ruby
- rvm reset
- wget https://raw.githubusercontent.com/yast/yast-devtools/SLE-12-GA/travis-tools/travis_setup.sh
- sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2" -g "yast-rake gettext"
- sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-bootloader yast2-storage" -g "yast-rake gettext rspec:3.3.0 simplecov coveralls"
script:
- rake check:syntax
- rake check:pot
- make -f Makefile.cvs
- make
- sudo make install
- make check

- COVERAGE=1 rake test:unit
- sudo rake install
7 changes: 7 additions & 0 deletions package/yast2-tune.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 11 12:24:21 UTC 2016 - igonzalezsosa@suse.com

- Prevent scheduler settings to be removed during installation
(bsc#968192)
- 3.1.9

-------------------------------------------------------------------
Wed Jun 1 17:28:56 UTC 2016 - cwh@suse.com

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-tune.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-tune
Version: 3.1.8
Version: 3.1.9
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down
Loading

0 comments on commit 292a6f3

Please sign in to comment.