Skip to content

Commit a1e0fa2

Browse files
committed
chore: Change Renovate configuration and change project files for new Renovate
1 parent 7fd1750 commit a1e0fa2

File tree

5 files changed

+77
-12
lines changed

5 files changed

+77
-12
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ on:
44
branches-ignore:
55
- "github-pages"
66
pull_request: {}
7+
env:
8+
# renovate: datasource=github-tags depName=golangci/golangci-lint
9+
GOLANGCI_LINT_VERSION: "v1.60.3"
10+
GOLANG_VERSION: "^1.22.0"
711
jobs:
812
changes:
913
runs-on: ubuntu-latest
@@ -40,11 +44,11 @@ jobs:
4044
- uses: actions/checkout@v4
4145
- uses: actions/setup-go@v5
4246
with:
43-
go-version: "^1.22.0"
47+
go-version: "$GOLANG_VERSION"
4448
- uses: golangci/golangci-lint-action@v6
4549
with:
4650
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
47-
version: v1.60.3
51+
version: "$GOLANGCI_LINT_VERSION"
4852

4953
# Optional: working directory, useful for monorepos
5054
# working-directory: somedir
@@ -75,7 +79,7 @@ jobs:
7579
- uses: actions/checkout@v4
7680
- uses: actions/setup-go@v5
7781
with:
78-
go-version: "^1.22.0"
82+
go-version: "$GOLANG_VERSION"
7983
- run: make code/build
8084
build-cross:
8185
if: |
@@ -93,7 +97,7 @@ jobs:
9397
- uses: actions/checkout@v4
9498
- uses: actions/setup-go@v5
9599
with:
96-
go-version: "^1.22.0"
100+
go-version: "$GOLANG_VERSION"
97101
- run: make code/build-cross
98102
test:
99103
if: |
@@ -108,7 +112,7 @@ jobs:
108112
- uses: actions/checkout@v4
109113
- uses: actions/setup-go@v5
110114
with:
111-
go-version: "^1.22.0"
115+
go-version: "$GOLANG_VERSION"
112116
- run: |
113117
if [ -f /usr/local/bin/dockerize ]; then
114118
echo "dockerize found; skipping installation";

.github/workflows/docs.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ on:
44
branches-ignore:
55
- "github-pages"
66
pull_request: {}
7+
env:
8+
# renovate: datasource=docker depName=squidfunk/mkdocs-material
9+
MKDOCS_MATERIAL_VERSION: "9.5.15"
10+
# renovate: datasource=pypi depName=mkdocs-awesome-pages-plugin
11+
MKDOCS_AWESOME_PAGES_PLUGIN_VERSION: "2.8.0"
712
jobs:
813
changes:
914
runs-on: ubuntu-latest
@@ -34,8 +39,8 @@ jobs:
3439
- uses: actions/setup-python@v5
3540
with:
3641
python-version: 3.x
37-
- run: pip install mkdocs-material==9.5.15
38-
- run: pip install mkdocs-awesome-pages-plugin==2.8.0
42+
- run: pip install mkdocs-material==$MKDOCS_MATERIAL_VERSION
43+
- run: pip install mkdocs-awesome-pages-plugin==$MKDOCS_AWESOME_PAGES_PLUGIN_VERSION
3944
- run: mkdocs build
4045
docs-deploy:
4146
needs:
@@ -50,6 +55,6 @@ jobs:
5055
- uses: actions/setup-python@v5
5156
with:
5257
python-version: 3.x
53-
- run: pip install mkdocs-material==9.5.15
54-
- run: pip install mkdocs-awesome-pages-plugin==2.8.0
58+
- run: pip install mkdocs-material==$MKDOCS_MATERIAL_VERSION
59+
- run: pip install mkdocs-awesome-pages-plugin==$MKDOCS_AWESOME_PAGES_PLUGIN_VERSION
5560
- run: mkdocs gh-deploy --force

Dockerfile.docs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
FROM squidfunk/mkdocs-material:9.5.15
22

3-
RUN pip install mkdocs-awesome-pages-plugin==2.8.0
3+
# renovate: datasource=pypi depName=mkdocs-awesome-pages-plugin
4+
ENV MKDOCS_AWESOME_PAGES_PLUGIN_VERSION="2.8.0"
5+
6+
RUN pip install mkdocs-awesome-pages-plugin==${MKDOCS_AWESOME_PAGES_PLUGIN_VERSION}

Makefile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@ HAS_MOCKGEN:=$(shell command -v mockgen;)
3434
HAS_GOTESTSUM:=$(shell command -v gotestsum;)
3535
HAS_FIELDALIGNMENT:=$(shell command -v fieldalignment;)
3636

37+
#
38+
## Tool versions
39+
#
40+
41+
# ? Note: Go install versions are inline because renovate can manage them like that.
42+
43+
# renovate: datasource=github-tags depName=golangci/golangci-lint
44+
GOLANGCI_LINT_VERSION := "v1.60.3"
45+
3746
.DEFAULT_GOAL := code/lint
3847

3948
#############
@@ -175,7 +184,7 @@ ifndef HAS_GOLANGCI_LINT
175184
ifndef HAS_CURL
176185
$(error You must install curl)
177186
endif
178-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.60.3
187+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin $(GOLANGCI_LINT_VERSION)
179188
endif
180189
ifndef HAS_GIT
181190
$(error You must install Git)

renovate.json

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,48 @@
11
{
2-
"extends": ["config:base"],
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended",
5+
":rebaseStalePrs",
6+
":semanticCommits",
7+
":semanticCommitScope(deps)"
8+
],
9+
"configMigration": true,
10+
"labels": ["renovate"],
11+
"pre-commit": {
12+
"enabled": true
13+
},
14+
"vulnerabilityAlerts": {
15+
"enabled": true,
16+
"labels": ["vulnerability-alert"]
17+
},
18+
"packageRules": [
19+
{
20+
"groupName": "mkdocs",
21+
"groupSlug": "mkdocs",
22+
"matchPackageNames": ["mkdocs-material", "squidfunk/mkdocs-material"]
23+
},
24+
{
25+
"groupName": "golangci/golangci-lint",
26+
"groupSlug": "golangci_golangci_lint",
27+
"matchPackageNames": ["golangci/golangci-lint"]
28+
}
29+
],
30+
"customManagers": [
31+
{
32+
"customType": "regex",
33+
"fileMatch": ["^Makefile$", "^.github/workflows/.*\\.yml"],
34+
"matchStrings": [
35+
"#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s.*?_VERSION\\s*[:=]+\\s*\"(?<currentValue>.*)\"\\s"
36+
],
37+
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
38+
},
39+
{
40+
"fileMatch": ["^Makefile$"],
41+
"matchStrings": [
42+
"go install (?<depName>[^@]+?)@(?<currentValue>[0-9.-a-zA-Z]+)"
43+
],
44+
"datasourceTemplate": "go"
45+
}
46+
],
347
"ignoreDeps": ["github.com/aws/aws-sdk-go"]
448
}

0 commit comments

Comments
 (0)