Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let the make manifest work properly #2917

Merged
merged 2 commits into from
Jun 16, 2023

Conversation

wangyang0616
Copy link
Member

@wangyang0616 wangyang0616 commented Jun 15, 2023

Remove vendor #2863 cleans up the vendor directory in the code warehouse, but some scripts in the CI project depend on part of the content in the local vendor. After the pr is merged, the CI operation fails.

The current pr fixes the problem of CI running failure:

  1. When the make manifest is executed, the advanced go mod vendor builds locally. The current method may not be the optimal solution, but it can ensure the normal operation of CI first, and then consider the optimization of the make manifest
  2. The generate-code check uses the script in the hack directory
  3. verify-vendor.sh

Signed-off-by: wangyang <wangyang8126@gmail.com>
@volcano-sh-bot volcano-sh-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 15, 2023
@xiao-jay
Copy link
Contributor

xiao-jay commented Jun 15, 2023

@wangyang0616 change suggestion
1、https://github.com/volcano-sh/volcano/blob/master/hack/update-gencode.sh#L29
should change from bash vendor/k8s.io/code-generator/generate-groups.sh to hack/generate-groups.sh
because hack/verify-gencode.sh will exec "${SCRIPT_ROOT}/hack/update-gencode.sh"
2、https://github.com/volcano-sh/volcano/blob/master/Makefile#LL159C2-L159C23
sbould change form hack/verify-vendor.sh to hack/verify-gomod.sh

@lowang-bh
Copy link
Member

update-gencode.sh also rely on vendor.

I think we need to search where vender is used and solve them. such as verify-vendor-licenses.sh, hack/update-gencode.sh and hack/update-vendor-licenses.sh.

@volcano-sh-bot volcano-sh-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 16, 2023
Signed-off-by: wangyang <wangyang8126@gmail.com>
@@ -156,7 +157,6 @@ clean:
verify:
hack/verify-gofmt.sh
hack/verify-gencode.sh
hack/verify-vendor.sh
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why remove this verify

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This check is mainly to determine whether the vendor in the local directory is the latest version.

The vendor directory has been removed from the code warehouse, so this check can also be removed

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, good to know

Copy link
Member

@william-wang william-wang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@volcano-sh-bot volcano-sh-bot added the lgtm Indicates that a PR is ready to be merged. label Jun 16, 2023
@volcano-sh-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: william-wang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@volcano-sh-bot volcano-sh-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 16, 2023
@volcano-sh-bot volcano-sh-bot merged commit 2721275 into volcano-sh:master Jun 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants