Name it better (#38)

paulo-ferraz-oliveira · Jun 7, 2024 · 56805e5 · 56805e5
1 parent d6023d5
commit 56805e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -1,7 +1,10 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:best-practices"
+    "config:recommended",
+    "helpers:pinGitHubActionDigests",
+    ":pinDevDependencies",
+    ":pinDigestsDisabled"
   ],
   "packageRules": [
     {
@@ -45,7 +48,7 @@
         ".github/.*/.*\\.yml"
       ],
       "matchStrings": [
-        "# renovate datasource: (?<datasource>[^,]+), depName: (?<depName>[^\\n]+)\\n.+?(?<currentValue>v?\\d+(\\.\\d+(\\.\\d+)?)?)\\n"
+        "# renovate datasource: (?<datasource>[^,]+), depName: (?<depName>[^\\n]+)\\n.+?(?<currentValue>v?\\d+(\\.\\d+(\\.\\d+)?)?(-[^\\n]+)?)\\n"
       ]
     },
     {
@@ -61,7 +64,7 @@
       "versioningTemplate": "semver"
     },
     {
-      "description": "Match versions in Dockerfile",
+      "description": "Match versions (per datasource and depName) in Dockerfile",
       "customType": "regex",
       "fileMatch": [
         "Dockerfile"

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
 
     env:
       # renovate datasource: docker, depName: hadolint/hadolint
-      hadolint: 2.12.0
+      hadolint-version: 2.12.0
 
     steps:
       - name: Checkout
@@ -23,7 +23,7 @@ jobs:
           npm run dist
 
       - name: Lint Dockerfile
-        run: docker run --rm -i hadolint/hadolint:${{ env.hadolint }} < Dockerfile
+        run: docker run --rm -i hadolint/hadolint:${{ env.hadolint-version }} < Dockerfile
 
       - name: Check if build left artifacts
         run: git diff --exit-code