diff --git a/pillar/role/jekyll_master.sls b/pillar/role/jekyll_master.sls index 6277944..088487c 100644 --- a/pillar/role/jekyll_master.sls +++ b/pillar/role/jekyll_master.sls @@ -37,3 +37,7 @@ zypper: baseurl: http://download.infra.opensuse.org/repositories/openSUSE:/infrastructure:/jekyll/openSUSE_Leap_$releasever/ priority: 100 refresh: True + devel:languages:ruby: + baseurl: http://download.infra.opensuse.org/repositories/devel:/languages:/ruby/openSUSE_Leap_$releasever/ + priority: 100 + refresh: True diff --git a/salt/profile/jekyll/files/git_pull_and_update.sh b/salt/profile/jekyll/files/git_pull_and_update.sh index bccea9c..764ab1e 100644 --- a/salt/profile/jekyll/files/git_pull_and_update.sh +++ b/salt/profile/jekyll/files/git_pull_and_update.sh @@ -25,9 +25,9 @@ for dir in $GIT_DIRS ; do cd "$BASEDIR/$dir" || exit 1 current_md5=$(md5sum "Gemfile.lock" | cut -d " " -f1) [[ $(cat Gemfile.lock.md5) != $current_md5 ]] && rm -rf vendor - bundle install --deployment || exit 1 - [[ -f "Rakefile" ]] && bundle exec rake - bundle exec jekyll build -d "$DESTDIR/$dir/" && echo $current_md5 > Gemfile.lock.md5 || exit 1 + bundle.ruby2.7 install --deployment || exit 1 + [[ -f "Rakefile" ]] && bundle.ruby2.7 exec rake + bundle.ruby2.7 exec jekyll build -d "$DESTDIR/$dir/" && echo $current_md5 > Gemfile.lock.md5 || exit 1 done # sync to all servers diff --git a/salt/profile/jekyll/master.sls b/salt/profile/jekyll/master.sls index 9dcb45f..008b89a 100644 --- a/salt/profile/jekyll/master.sls +++ b/salt/profile/jekyll/master.sls @@ -6,8 +6,8 @@ jekyll_master_pgks: - git - rsync # To find out the package name in the repo, run `zypper se --provides rubygem\(bundler\)` - - ruby2.5-rubygem-bundler - - ruby-devel + - ruby2.7-rubygem-bundler + - ruby2.7-devel # Needed for planet to work with its database - sqlite3-devel - libopenssl-devel