Skip to content

Commit

Permalink
update go:generate targets
Browse files Browse the repository at this point in the history
Signed-off-by: Alexandre Lamarre <[email protected]>
  • Loading branch information
alexandreLamarre committed Jan 28, 2025
1 parent 29403a0 commit 33f8461
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/hl-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
- 'crds/helm-locker/**'
- 'package/Dockerfile-helm-locker'
- 'cmd/helm-locker/**'
- 'pkg/helm-locker/**'
- 'internal/helm-locker/**'

env:
CLUSTER_NAME : e2e-ci-helm-locker
Expand Down
12 changes: 6 additions & 6 deletions generate.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
//go:generate go run pkg/codegen/buildconfig/writer.go pkg/codegen/buildconfig/main.go

//go:generate go run pkg/helm-locker/codegen/cleanup/main.go
//go:generate go run pkg/helm-locker/codegen/main.go
//go:generate go run ./pkg/helm-locker/codegen crds ./crds/helm-locker/crds.yaml
//go:generate go run internal/helm-locker/codegen/cleanup/main.go
//go:generate go run internal/helm-locker/codegen/main.go
//go:generate go run ./internal/helm-locker/codegen crds ./crds/helm-locker/crds.yaml

//go:generate go run pkg/helm-project-operator/codegen/cleanup/main.go
//go:generate go run pkg/helm-project-operator/codegen/main.go
//go:generate go run ./pkg/helm-project-operator/codegen crds ./crds/helm-project-operator ./crds/helm-project-operator
//go:generate go run internal/helm-project-operator/codegen/cleanup/main.go
//go:generate go run internal/helm-project-operator/codegen/main.go
//go:generate go run ./internal/helm-project-operator/codegen crds ./crds/helm-project-operator ./crds/helm-project-operator

package main
4 changes: 2 additions & 2 deletions internal/helm-locker/codegen/cleanup/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
)

func main() {
if err := cleanup.Cleanup("./pkg/helm-locker/apis"); err != nil {
if err := cleanup.Cleanup("./internal/helm-locker/apis"); err != nil {
logrus.Fatal(err)
}
if err := os.RemoveAll("./pkg/helm-locker/generated"); err != nil {
if err := os.RemoveAll("./internal/helm-locker/generated"); err != nil {
logrus.Fatal(err)
}
if err := os.RemoveAll("./crds/helm-locker"); err != nil {
Expand Down
2 changes: 1 addition & 1 deletion internal/helm-locker/codegen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ func main() {
os.Unsetenv("GOPATH")
logrus.Info("Generating controller boilerplate")
controllergen.Run(args.Options{
OutputPackage: "github.com/rancher/prometheus-federator/internal/helm-locker/cker/generated",
OutputPackage: "github.com/rancher/prometheus-federator/internal/helm-locker/generated",
Boilerplate: "gen/boilerplate.go.txt",
Groups: map[string]args.Group{
"helm.cattle.io": {
Expand Down
4 changes: 2 additions & 2 deletions internal/helm-project-operator/codegen/cleanup/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
)

func main() {
if err := cleanup.Cleanup("./pkg/helm-project-operator/apis"); err != nil {
if err := cleanup.Cleanup("./internal/helm-project-operator/apis"); err != nil {
logrus.Fatal(err)
}
if err := os.RemoveAll("./pkg/helm-project-operator/generated"); err != nil {
if err := os.RemoveAll("./internal/helm-project-operator/generated"); err != nil {
logrus.Fatal(err)
}
if err := os.RemoveAll("./crds/helm-project-operator"); err != nil {
Expand Down

0 comments on commit 33f8461

Please sign in to comment.