Skip to content

Conversation

@spectrometerHBH
Copy link
Contributor

This bumps all the version numbers on v0.13.0 branch as correct v0.13.0.

@tvm-bot
Copy link
Collaborator

tvm-bot commented Jul 3, 2023

Thanks for contributing to TVM! Please refer to the contributing guidelines https://tvm.apache.org/docs/contribute/ for useful information and tips. Please request code reviews from Reviewers by @-ing them in a comment.

  • No users to tag found in teams: release See #10317 for details

Generated by tvm-bot

@ysh329
Copy link
Contributor

ysh329 commented Jul 4, 2023

@junrushao
Copy link
Member

@tvm-bot rerun

@ysh329
Copy link
Contributor

ysh329 commented Jul 5, 2023

I think we meet the problem same as last time 😢 , as @leandron said: CI will try to git merge your current patch with "top of the repository", and as the top of the repository is now fixed to 0.13.dev0, it diverges from what you propose here.. @driazati can you help?

@Johnson9009
Copy link
Contributor

Can anybody help to see the CI issue? It seems these thing block the process of release schedule several times.

@Hzfengsy
Copy link
Member

Hzfengsy commented Jul 6, 2023

cc @tqchen

@leandron
Copy link
Contributor

leandron commented Jul 6, 2023

I think for next releases we should create a branch which doesn't conform the with pattern that gets automatically protected, and instead, create something like v0.15.0-rc0. Once everything is settled, then we just mark that as the official branch, otherwise, we'll always face this issue.

@tqchen do you know any other alternative?

@tqchen
Copy link
Member

tqchen commented Jul 6, 2023

created https://github.com/apache/tvm/tree/rc-v0.13.0, and confirmed that it do not have protection. as long as v0.13.0 prefix exists the branch is still protected.

Let us send the PR there and do the release, then we can create a branch later, likely need to do so with manual push. We need signed commits (which merging to the branch achieves)

@ysh329
Copy link
Contributor

ysh329 commented Jul 7, 2023

created https://github.com/apache/tvm/tree/rc-v0.13.0, and confirmed that it do not have protection. as long as v0.13.0 prefix exists the branch is still protected.

Let us send the PR there and do the release, then we can create a branch later, likely need to do so with manual push. We need signed commits (which merging to the branch achieves)

Great. It seems that in the future, we need to first create a candidate branch named rc-v0.xx.0. After version modification ensured, then create a branch named v0.xx.0 instead.

Hi @spectrometerHBH , can you help send the PR to branch rc-v0.13.0?

@ysh329
Copy link
Contributor

ysh329 commented Jul 8, 2023

created https://github.com/apache/tvm/tree/rc-v0.13.0, and confirmed that it do not have protection. as long as v0.13.0 prefix exists the branch is still protected.
Let us send the PR there and do the release, then we can create a branch later, likely need to do so with manual push. We need signed commits (which merging to the branch achieves)

Great. It seems that in the future, we need to first create a candidate branch named rc-v0.xx.0. After version modification ensured, then create a branch named v0.xx.0 instead.

Hi @spectrometerHBH , can you help send the PR to branch rc-v0.13.0?

I filed a PR #15266 and found this is not about branch protection. Acrroding to the Jenkins config, git merge is inevitable for non-main branch in default Jenkins CI config.

I think we can use same method like #14715 to disable the git merge with latest main on this 0.13.0 branch. I made a PR #15267 to disable git merge on v0.13.0 to avoid this conflict. I think after this #15267 merged, we can rerun this current PR #15216.

@tqchen
Copy link
Member

tqchen commented Jul 8, 2023

Having a non-protected branch still helps, since that enables us to be able to pick changes in without having to rely on CI

@ysh329
Copy link
Contributor

ysh329 commented Jul 10, 2023

@tvm-bot rerun

@ysh329
Copy link
Contributor

ysh329 commented Jul 10, 2023

After rerun CI of this PR, conflict is existing. It seems current PR is lack of git pull latest v0.13.0 with #15267. Due to DDL, I made a PR #15273 doing same thing.

@Hzfengsy
Copy link
Member

finished in #15273

@Hzfengsy Hzfengsy closed this Jul 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants