Skip to content

Commit 2845028

Browse files
authored
build: Use upstream packages again from upstream (#908)
golangci-lint is now built with go 1.23 so is usable from upstream nixpkgs, as well as clusterctl 1.8.2. Streamlining this should make installation a little faster and remove need for maintenance of custom packge configurations.
1 parent 10ea179 commit 2845028

File tree

7 files changed

+480
-425
lines changed

7 files changed

+480
-425
lines changed

api/v1alpha1/nutanix_clusterconfig_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ func (s NutanixPrismCentralEndpointSpec) ParseURL() (string, uint16, error) {
7474
return "", 0, fmt.Errorf("error converting port to int: %w", err)
7575
}
7676

77-
return hostname, uint16(port), nil //nolint:gosec // Bounds are checked by ParseUint call above.
77+
return hostname, uint16(port), nil
7878
}

api/v1alpha1/zz_generated.deepcopy.go

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

devbox.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"packages": [
33
"actionlint@latest",
44
"chart-testing@latest",
5+
"clusterctl@latest",
56
"coreutils@latest",
67
"crane@latest",
78
"envsubst@latest",
@@ -13,6 +14,7 @@
1314
"gnused@latest",
1415
"go@latest",
1516
"gojq@latest",
17+
"golangci-lint@latest",
1618
"golines@latest",
1719
"gomplate@latest",
1820
"goreleaser@latest",
@@ -30,11 +32,8 @@
3032
"yamale@latest",
3133
"yamllint@latest",
3234
"yq-go@latest",
33-
"path:./hack/flakes#clusterctl",
3435
"path:./hack/flakes#clusterctl-aws",
3536
"path:./hack/flakes#controller-gen",
36-
"path:./hack/flakes#go-mod-upgrade",
37-
"path:./hack/flakes#golangci-lint",
3837
"path:./hack/flakes#goprintconst",
3938
"path:./hack/flakes#govulncheck",
4039
"path:./hack/flakes#helm-with-plugins",

0 commit comments

Comments
 (0)