Implement required patches for kcp #6
Conversation
On-behalf-of: @SAP [email protected] Signed-off-by: Marko Mudrinić <[email protected]>
kcp-ci-bot
added
dco-signoff: yes
|
/hold |
kcp-ci-bot
added
the
do-not-merge/hold
|
|
||
| if [ ! $# -eq 15 ]; then | ||
| echo "usage: $0 repo src_branch dst_branch dependent_k8s.io_repos required_packages kubernetes_remote subdirectories source_repo_org source_repo_name base_package is_library recursive_delete_pattern skip_tags last_published_upstream_hash git_default_branch" | ||
| if [ ! $# -eq 17 ]; then |
| if [ "${new_branch}" = "true" ] && [ "${src_branch}" = "${git_default_branch}" ]; then | ||
| # new master branch | ||
| filter-branch "${commit_msg_tag}" "${subdirectories}" "${recursive_delete_pattern}" ${src_branch} filtered-branch | ||
| filter-branch "${commit_msg_tag}" "${subdirectories}" "${recursive_delete_pattern}" "upstream/${src_branch}" filtered-branch |
There was a problem hiding this comment.
@sttts I'm not sure I understand this comment, ${src_branch} has been replaced with "upstream/${src_branch}". The effect and the result are the same, but omitting upstream/ caused an error for kcp.
There was a problem hiding this comment.
Ack. So upstream was dervied by filter-branch, but it was always "upstream/" as (implicit) prefix.
cmd/publishing-bot/config/rules.go
Outdated
| SkippedSourceBranches []string `yaml:"skip-source-branches,omitempty"` | ||
| SkipGomod bool `yaml:"skip-gomod,omitempty"` | ||
| SkipTags bool `yaml:"skip-tags,omitempty"` | ||
| SkipNonSemverTags bool `yaml:"skip-non-semver-tags,omitempty"` |
There was a problem hiding this comment.
I added a comment for this field, is that enough?
On-behalf-of: @SAP [email protected] Signed-off-by: Marko Mudrinić <[email protected]>
On-behalf-of: @SAP [email protected] Signed-off-by: Marko Mudrinić <[email protected]>
|
LGTM label has been added. Git tree hash: a5e78b6d5273d39b55f9c4d0fcd046d8d2f6e460
|
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: embik 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 |
kcp-ci-bot
added
the
approved
|
Lift hold when feedback is addressed. |
|
/lgtm |
kcp-ci-bot
removed
the
do-not-merge/hold
5 participants
This PR implements some required patches to make the publishing-bot work for kcp:
skip-non-semver-tagsanddestination-tag-base)Speaking of tags, the upstream publishing-bot always pushes two tags:
<source-repo-name>-<source-tag-name>and<tag-name>(if--publish-v0-semverflag is set inartifacts/scripts/construct.sh).However, publishing-bot constructs
<tag-name>with v0 major regardless of the major version of the source tag. But even if that wasn't the case, our source repo (kcp-dev/kcp) is at v0 major, while staged repositories (apimachineryandcode-generatorto be precise) are at v2 and v3 major. For those affected staged repositories, we can't push a tag with v0 major, because the Go module is also at v2 and v3, respectively.Instead, we'll push tags that are v2 major and v3 major for those repositories, and these two new options will allow us to do that. For example, when we push v0.29.0 to
kcp-dev/kcp, publishing-bot will push v2.29.0 tokcp-dev/apimachineryand v3.29.0 tokcp-dev/code-generator./assign @xrstf @embik