Merge remote-tracking branch 'origin/SLE-12-GA'

Conflicts: .travis.yml Rakefile
yast · Nov 14, 2014 · 56bd4f9 · 56bd4f9
2 parents 7ab4deb + 552e812
commit 56bd4f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,8 +5,10 @@ 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-testsuite yast2" -g rspec:2.14.1
+    - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2" -g "rspec:2.14.1 yast-rake gettext"
 script:
+    - rake check:syntax
+    - rake check:pot
     - make -f Makefile.cvs
     - make
     - sudo make install

diff --git a/Rakefile b/Rakefile
@@ -1,10 +1,5 @@
 require "yast/rake"
 
-# do nothing in osc:build as it can be builds exclusivelly on s390
-if `uname --machine` !~ /s390/
-  Rake::Task["osc:build"].clear_actions
-end
-
 Yast::Tasks.configuration do |conf|
   #lets ignore license check for now
   conf.skip_license_check << /.*/