Skip to content

Commit 48a107e

Browse files
.
1 parent ff6ca11 commit 48a107e

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.github/renovate.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
33
"extends": [
4-
"config:best-practices"
4+
"config:recommended",
5+
"helpers:pinGitHubActionDigests",
6+
":pinDevDependencies",
7+
":pinDigestsDisabled"
58
],
69
"packageRules": [
710
{
@@ -45,7 +48,7 @@
4548
".github/.*/.*\\.yml"
4649
],
4750
"matchStrings": [
48-
"# renovate datasource: (?<datasource>[^,]+), depName: (?<depName>[^\\n]+)\\n.+?(?<currentValue>v?\\d+(\\.\\d+(\\.\\d+)?)?)\\n"
51+
"# renovate datasource: (?<datasource>[^,]+), depName: (?<depName>[^\\n]+)\\n.+?(?<currentValue>v?\\d+(\\.\\d+(\\.\\d+)?)?(-[^\\n]+)?)\\n"
4952
]
5053
},
5154
{
@@ -61,7 +64,7 @@
6164
"versioningTemplate": "semver"
6265
},
6366
{
64-
"description": "Match versions in Dockerfile",
67+
"description": "Match versions (per datasource and depName) in Dockerfile",
6568
"customType": "regex",
6669
"fileMatch": [
6770
"Dockerfile"

.github/workflows/lint.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@ name: Lint
44
"on": push
55

66
jobs:
7+
vsns:
8+
runs-on: ubuntu-22.04
9+
10+
outputs:
11+
# renovate datasource: docker, depName: hadolint/hadolint
12+
hadolint: 2.12.0
13+
714
build:
815
name: Lint
916

1017
runs-on: ubuntu-22.04
1118

12-
env:
13-
# renovate datasource: docker, depName: hadolint/hadolint
14-
hadolint-version: 2.12.0
19+
needs: [vsns]
1520

1621
steps:
1722
- name: Checkout
@@ -23,7 +28,7 @@ jobs:
2328
npm run dist
2429
2530
- name: Lint Dockerfile
26-
run: docker run --rm -i hadolint/hadolint:${{ env.hadolint-version }} < Dockerfile
31+
run: docker run --rm -i hadolint/hadolint:${{ needs.vsns.outputs.hadolint }} < Dockerfile
2732

2833
- name: Check if build left artifacts
2934
run: git diff --exit-code

0 commit comments

Comments
 (0)