fix: accept that there is a os name in the version now

betadots · Feb 21, 2025 · 178db8f · 178db8f
1 parent c6a1f5f
commit 178db8f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -48,10 +48,10 @@ RUN apt update && apt upgrade -y && apt install -y --no-install-recommends \
     ca-certificates \
     git \
     locales \
-    pdk=${PDK_VERSION}-1${UBUNTU_CODENAME} \
-    puppet-agent=${PUPPET_VERSION}-1${UBUNTU_CODENAME} \
-    puppet-bolt=${BOLT_VERSION}-1${UBUNTU_CODENAME} \
-    puppetdb-termini=${PUPPETDB_TERMINI_VERSION}-1${UBUNTU_CODENAME} \
+    pdk=${PDK_VERSION} \
+    puppet-agent=${PUPPET_VERSION} \
+    puppet-bolt=${BOLT_VERSION} \
+    puppetdb-termini=${PUPPETDB_TERMINI_VERSION} \
     unzip \
     yamllint \
     jq \

diff --git a/renovate.json b/renovate.json
@@ -20,7 +20,7 @@
     {
       "customType": "regex",
       "fileMatch": ["build_versions.yaml"],
-      "matchStrings": ["#\\s*renovate:\\s*depName=(?<depName>.*?)\\s*puppetRelease=(?<puppetRelease>\\d+)\\s*\\n\\s*(?<key>\\w+_version):\\s*\"(?<currentValue>[^\"]*?)(?:-1jammy)?\""],
+      "matchStrings": ["#\\s*renovate:\\s*depName=(?<depName>.*?)\\s*puppetRelease=(?<puppetRelease>\\d+)\\s*\\n\\s*(?<key>\\w+_version):\\s*\"(?<currentValue>.*?)\""],
       "registryUrlTemplate": "http://apt.puppet.com?suite=jammy&components=puppet{{puppetRelease}}&binaryArch=amd64",
       "datasourceTemplate": "deb"
     }