Merge develop into master

LyraPhase · Jul 23, 2024 · 38ae80a · 38ae80a
2 parents 8fd00ec + 82e94fc
commit 38ae80a
Show file tree

Hide file tree

Showing 8 changed files with 198 additions and 90 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.7.5
+3.1.0
diff --git a/.rubygems-version b/.rubygems-version
@@ -1 +1 @@
-3.2.33
+3.3.4
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "davidanson.vscode-markdownlint",
+    "elagil.pre-commit-helper",
+    "cschleiden.vscode-github-actions"
+  ]
+}
diff --git a/.vscode/sprout-wrap.code-workspace b/.vscode/sprout-wrap.code-workspace
@@ -0,0 +1,8 @@
+{
+	"folders": [
+		{
+			"path": ".."
+		}
+	],
+	"settings": {}
+}
diff --git a/Gemfile b/Gemfile
@@ -32,4 +32,4 @@ group :development do
   gem 'fauxhai', '~> 6.0.0', require: false # versions after 6.0.1 remove `node['etc']`
 end
 
-gem 'chef-zero', '~> 13.1', require: false # versions after 14.x require ruby 2.4
+#gem 'chef-zero', '~> 13.1', require: false # versions after 14.x require ruby 2.4