Skip to content

Commit

Permalink
Merge pull request #9794 from danudey/fix-make-multiple-targets-v3.29
Browse files Browse the repository at this point in the history
Fix make-check multiple targets error
  • Loading branch information
danudey authored Feb 4, 2025
2 parents 9b2e1f0 + de0dcd2 commit f35f30c
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions release/pkg/manager/calico/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,18 @@ func (r *CalicoManager) PreReleaseValidate(ver string) error {
}

// Check that code generation is up-to-date.
if err := r.makeInDirectoryIgnoreOutput(r.repoRoot, "generate get-operator-crds check-dirty"); err != nil {
return fmt.Errorf("code generation error (try 'make generate' and/or 'make get-operator-crds' ?): %s", err)
if err := r.makeInDirectoryIgnoreOutput(r.repoRoot, "generate"); err != nil {
return fmt.Errorf("code generation error (try 'make generate'): %s", err)
}

// Check that code generation is up-to-date.
if err := r.makeInDirectoryIgnoreOutput(r.repoRoot, "get-operator-crds"); err != nil {
return fmt.Errorf("code generation error (try 'make get-operator-crds'): %s", err)
}

// Check that code generation is up-to-date.
if err := r.makeInDirectoryIgnoreOutput(r.repoRoot, "check-dirty"); err != nil {
return fmt.Errorf("code generation error (try 'make generate get-operator-crds') and commit the changes: %s", err)
}

// Assert that manifests are using the correct version.
Expand Down

0 comments on commit f35f30c

Please sign in to comment.