From 5afc62d9922d9b68ed82a8b49c3ad022dc281863 Mon Sep 17 00:00:00 2001
From: Robert Waffen <rwaffen@gmail.com>
Date: Thu, 13 Jun 2024 10:43:38 +0200
Subject: [PATCH 1/3] Update puppet to 7.31.0 & 8.7.0 and also update gem
 versions

---
 build_versions.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/build_versions.json b/build_versions.json
index 36d69c3..6ba71ff 100644
--- a/build_versions.json
+++ b/build_versions.json
@@ -3,12 +3,12 @@
     {
       "puppet_release": 7,
       "base_image": "ghcr.io/betadots/ruby:2.7.8-focal",
-      "rubygem_puppet": "7.30.0",
-      "rubygem_facter": "4.7.0",
-      "rubygem_voxpupuli_test": "7.1.0",
-      "rubygem_voxpupuli_acceptance": "3.0.0",
+      "rubygem_puppet": "7.31.0",
+      "rubygem_facter": "4.7.1",
+      "rubygem_voxpupuli_test": "8.0.0",
+      "rubygem_voxpupuli_acceptance": "3.2.0",
       "rubygem_voxpupuli_release": "3.0.1",
-      "rubygem_puppet_metadata": "3.6.0",
+      "rubygem_puppet_metadata": "4.0.0",
       "rubygem_overcommit": "0.63.0",
       "rubygem_modulesync": "3.2.0",
       "rubygem_r10k": "4.1.0",
@@ -18,12 +18,12 @@
     {
       "puppet_release": 8,
       "base_image": "ghcr.io/betadots/ruby:3.2.3-jammy",
-      "rubygem_puppet": "8.6.0",
-      "rubygem_facter": "4.7.0",
-      "rubygem_voxpupuli_test": "7.1.0",
-      "rubygem_voxpupuli_acceptance": "3.0.0",
+      "rubygem_puppet": "8.7.0",
+      "rubygem_facter": "4.7.1",
+      "rubygem_voxpupuli_test": "8.0.0",
+      "rubygem_voxpupuli_acceptance": "3.2.0",
       "rubygem_voxpupuli_release": "3.0.1",
-      "rubygem_puppet_metadata": "3.6.0",
+      "rubygem_puppet_metadata": "4.0.0",
       "rubygem_overcommit": "0.63.0",
       "rubygem_modulesync": "3.2.0",
       "rubygem_r10k": "4.1.0",

From 75fa115096f11228ff17747df1376ba99190051f Mon Sep 17 00:00:00 2001
From: Robert Waffen <rwaffen@gmail.com>
Date: Thu, 13 Jun 2024 11:03:02 +0200
Subject: [PATCH 2/3] try to mitigate ffi-1.17.0 problem

- https://github.com/ffi/ffi/issues/1105
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 13a99b6..bd87dd8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,6 +50,7 @@ RUN apt-get update \
     && apt-get install -y yamllint \
     && apt-get autoremove -y \
     && apt-get clean \
+    && gem update --system \
     && bundle config set path.system true \
     && bundle config set jobs $(nproc) \
     && bundle install --gemfile=/Gemfile \

From 35f7089d83392a02e18cc36c2fcba867d8547fe2 Mon Sep 17 00:00:00 2001
From: Robert Waffen <rwaffen@gmail.com>
Date: Thu, 13 Jun 2024 11:11:34 +0200
Subject: [PATCH 3/3] try to mitigate ffi 1.17.0 problem v2

---
 Dockerfile     | 1 -
 voxbox/Gemfile | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bd87dd8..13a99b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,6 @@ RUN apt-get update \
     && apt-get install -y yamllint \
     && apt-get autoremove -y \
     && apt-get clean \
-    && gem update --system \
     && bundle config set path.system true \
     && bundle config set jobs $(nproc) \
     && bundle install --gemfile=/Gemfile \
diff --git a/voxbox/Gemfile b/voxbox/Gemfile
index 08acd01..61aa7af 100644
--- a/voxbox/Gemfile
+++ b/voxbox/Gemfile
@@ -12,5 +12,6 @@ gem 'voxpupuli-acceptance', ENV['RUBYGEM_VOXPUPULI_ACCEPTANCE']
 gem 'voxpupuli-release',    ENV['RUBYGEM_VOXPUPULI_RELEASE']
 gem 'voxpupuli-test',       ENV['RUBYGEM_VOXPUPULI_TEST']
 gem 'rubocop-performance',  ENV['RUBYGEM_RUBOCOP_PERFORMANCE']
+gem 'ffi', '~> 1.16.3' # ffi 1.17.0 has change dependencies - see https://github.com/ffi/ffi/issues/1105
 
 # vim: syntax=ruby