Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/SLE-12-SP3' into sp3_merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Aug 10, 2017
2 parents ab93d39 + af36ca4 commit 76640a5
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
*.pot
*.log
*.trs
Makefile
/Makefile.am
Makefile.am.common
Expand All @@ -12,6 +15,7 @@ config.*
configure
configure.in
configure.ac
coverage/
install-sh
pluglib-bindings.ami
*/.dep
Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ services:

before_install:
- docker build -t yast-yast2-image .
# list the installed packages (just for easier debugging)
- docker run --rm -it yast-yast2-image rpm -qa | sort

script:
# the "yast-travis-ruby" script is included in the base yastdevel/ruby image
# see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM yastdevel/ruby
FROM yastdevel/ruby:sle12-sp3
COPY . /usr/src/app
# English messages, UTF-8, "C" locale for numeric formatting tests
ENV LC_ALL= LANG=en_US.UTF-8 LC_NUMERIC=C
Expand Down
2 changes: 2 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
require "yast/rake"

Yast::Tasks.submit_to :sle12sp3

Yast::Tasks.configuration do |conf|
# lets ignore license check for now
conf.skip_license_check << /.*/
Expand Down

0 comments on commit 76640a5

Please sign in to comment.