Skip to content

Commit 1e59b38

Browse files
phiscomnencia
andauthored
chore(renovate): fix GOLANG and GOLANGCI_LINT versions (cloudnative-pg#1605)
Signed-off-by: Philippe Scorsolini <p.scorsolini@gmail.com> Signed-off-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com> Co-authored-by: Marco Nenciarini <marco.nenciarini@enterprisedb.com>
1 parent ca7feef commit 1e59b38

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/renovate.json5

+7-3
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,24 @@
9898
// Actions, taking it from the official GitHub repository.
9999
"fileMatch": ["^\\.github\\/workflows\\/[^/]+\\.ya?ml$"],
100100
"matchStrings": [
101-
"GO_VERSION: '(?<currentValue>.*?)'\\n"
101+
"GOLANG_VERSION: \"(?<currentValue>.*?)\\.x\"",
102102
],
103103
"datasourceTemplate": "golang-version",
104-
"depNameTemplate": "golang"
104+
"depNameTemplate": "golang",
105+
"versioningTemplate": "loose",
106+
"extractVersionTemplate": "^(?<version>\\d+\\.\\d+)"
105107
}, {
106108
// We want a PR to bump golangci-lint versions used through env variables in
107109
// any GitHub Actions or Makefile, taking it from the official GitHub
108110
// repository tags.
109111
"fileMatch": ["^\\.github\\/workflows\\/[^/]+\\.ya?ml$"],
110112
"matchStrings": [
111-
"GOLANGCI_LINT_VERSION: \"(?<currentValue>.*?)\"\\n",
113+
"GOLANGCI_LINT_VERSION: \"v(?<currentValue>.*?)\"",
112114
],
113115
"datasourceTemplate": "github-releases",
114116
"depNameTemplate": "golangci/golangci-lint",
117+
"versioningTemplate": "loose",
118+
"extractVersionTemplate": "^v(?<version>\\d+\\.\\d+)"
115119
}
116120
],
117121
"packageRules": [

internal/cmd/manager/controller/controller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
ctrl "sigs.k8s.io/controller-runtime"
3232
"sigs.k8s.io/controller-runtime/pkg/client"
3333

34+
// +kubebuilder:scaffold:imports
3435
apiv1 "github.com/cloudnative-pg/cloudnative-pg/api/v1"
3536
"github.com/cloudnative-pg/cloudnative-pg/controllers"
3637
"github.com/cloudnative-pg/cloudnative-pg/internal/configuration"
@@ -41,7 +42,6 @@ import (
4142
"github.com/cloudnative-pg/cloudnative-pg/pkg/multicache"
4243
"github.com/cloudnative-pg/cloudnative-pg/pkg/utils"
4344
"github.com/cloudnative-pg/cloudnative-pg/pkg/versions"
44-
// +kubebuilder:scaffold:imports
4545
)
4646

4747
var (

0 commit comments

Comments
 (0)