.

paulo-ferraz-oliveira · Jun 7, 2024 · d5f4837 · d5f4837
1 parent ff6ca11
commit d5f4837
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -45,7 +45,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 +61,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
@@ -4,14 +4,19 @@ name: Lint
 "on": push
 
 jobs:
+  vsns:
+    runs-on: ubuntu-22.04
+
+    outputs:
+      # renovate datasource: docker, depName: hadolint/hadolint
+      hadolint: 2.12.0
+
   build:
     name: Lint
 
     runs-on: ubuntu-22.04
 
-    env:
-      # renovate datasource: docker, depName: hadolint/hadolint
-      hadolint-version: 2.12.0
+    needs: [vsns]
 
     steps:
       - name: Checkout
@@ -23,7 +28,7 @@ jobs:
           npm run dist
 
       - name: Lint Dockerfile
-        run: docker run --rm -i hadolint/hadolint:${{ env.hadolint-version }} < Dockerfile
+        run: docker run --rm -i hadolint/hadolint:${{ needs.vsns.outputs.hadolint }} < Dockerfile
 
       - name: Check if build left artifacts
         run: git diff --exit-code