From af0012ffeb2c6104600f2f16c935ba2e2bb83e2a Mon Sep 17 00:00:00 2001
From: Alexander Olofsson <alexander.olofsson@liu.se>
Date: Tue, 21 May 2024 13:05:47 +0200
Subject: [PATCH] Ensure PDK 3.2.0 workarounds apply correctly
---
puppet-module-pipeline.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/puppet-module-pipeline.yaml b/puppet-module-pipeline.yaml
index a6072d3..bd7517f 100644
--- a/puppet-module-pipeline.yaml
+++ b/puppet-module-pipeline.yaml
@@ -30,8 +30,8 @@ pdk-validate:
touch Gemfile Gemfile.local
- # For PDK 3.2.0 (it reports as the unreleased 3.1.0)
- if [ "$PDK_VERSION" == "3.1.0" ]; then
+ # For PDK 3.2.0 (it can report as the unreleased 3.1.0)
+ if [ "$PDK_VERSION" == "3.1.0" ] || [ "$PDK_VERSION" == "3.1.0" ]; then
if [ "$PDK_RESOLVED_RUBY_VERSION" == "2.7.8" ]; then
echo "Locking racc to 1.4.16"
sed -e '/"racc"/d' -e "/'racc'/d" -i Gemfile Gemfile.local
--
GitLab