From 4007538f9a356b34ca1d6bcf11e4d8565342350e Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Jul 16 2023 16:14:02 +0000
Subject: Merge branch 'cboltz-jekyll-ruby3.1' into 'production'


Jekyll: switch to ruby3.1 to fulfill dependencies

See merge request infra/salt!663
---

diff --git a/salt/profile/jekyll/files/git_pull_and_update.sh b/salt/profile/jekyll/files/git_pull_and_update.sh
index a00a2fa..542673e 100644
--- a/salt/profile/jekyll/files/git_pull_and_update.sh
+++ b/salt/profile/jekyll/files/git_pull_and_update.sh
@@ -25,10 +25,10 @@ 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.ruby2.7 config set deployment 'true' || exit 1
-    bundle.ruby2.7 install || 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
+    bundle.ruby3.1 config set deployment 'true' || exit 1
+    bundle.ruby3.1 install || exit 1
+    [[ -f "Rakefile" ]] && bundle.ruby3.1 exec rake
+    bundle.ruby3.1 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 008b89a..685e594 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.7-rubygem-bundler
-      - ruby2.7-devel
+      - ruby3.1-rubygem-bundler
+      - ruby3.1-devel
       # Needed for planet to work with its database
       - sqlite3-devel
       - libopenssl-devel