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

[release] Update version to 0.14.0 and 0.15.0.dev on main branch #15847

Merged
merged 2 commits into from
Oct 11, 2023

Conversation

ysh329
Copy link
Contributor

@ysh329 ysh329 commented Oct 1, 2023

Update version to 0.14.0 on main branch

@ysh329 ysh329 changed the title Update version to 0.14.0 on main branch [release] Update version to 0.14.0 on main branch Oct 1, 2023
@ysh329 ysh329 mentioned this pull request Oct 1, 2023
18 tasks
@ysh329
Copy link
Contributor Author

ysh329 commented Oct 1, 2023

cc @Hzfengsy @junrushao

@Hzfengsy
Copy link
Member

Hzfengsy commented Oct 1, 2023

In the previous practice, we didn't change tags into the release version on the main branch.

Pros: It will make the release branch a commit on the main branch, rather than diverging from the commit line
Cons: There might be commits after v0.14 but before we change it to v0.15dev

Happy to hear voices from the community

@tqchen
Copy link
Member

tqchen commented Oct 2, 2023

The main issue is cherry picking, which will adds more to the branch

@ysh329
Copy link
Contributor Author

ysh329 commented Oct 3, 2023

Pros: downstream companies won't conflict because of version number.
cc @Johnson9009

@ysh329
Copy link
Contributor Author

ysh329 commented Oct 9, 2023

Here, let me explan why do first version modification to v0.14.0 on main branch.

Considering downstream companies need regularly do code merge with release code, each time version modification is after cut branch. In other words, each version modification commit is not on git main tree (and after branch cut we do version modification on main, two branch divergence), which results in code conflict such as version number between codebase of downstream companies and latest upstream release.

In the previous practice, we didn't change tags into the release version on the main branch.

Pros: It will make the release branch a commit on the main branch, rather than diverging from the commit line Cons: There might be commits after v0.14 but before we change it to v0.15dev

Happy to hear voices from the community

Besides, for Pros point exists both in the previous and this proposed release process.

@ysh329
Copy link
Contributor Author

ysh329 commented Oct 9, 2023

There may be a better solution: we make a PR with 2 commits (one is Modify version to v0.14.0 on main branch, the other is Modify version to v0.14.dev0 on main branch), and merge without squash. And do branch cut on first commit.

cc @Hzfengsy @junrushao @tqchen

@ysh329 ysh329 force-pushed the 0.14.0-on-main branch 2 times, most recently from a54358c to a89f187 Compare October 9, 2023 10:21
@ysh329 ysh329 changed the title [release] Update version to 0.14.0 on main branch [release] Update version to 0.14.0 and 0.15.0.dev on main branch Oct 9, 2023
Copy link
Member

@Hzfengsy Hzfengsy left a comment

Choose a reason for hiding this comment

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

LGTM

@tqchen tqchen merged commit 9f562b0 into apache:main Oct 11, 2023
7 checks passed
@ysh329 ysh329 deleted the 0.14.0-on-main branch October 12, 2023 02:02
@ysh329 ysh329 restored the 0.14.0-on-main branch October 12, 2023 02:05
@ysh329
Copy link
Contributor Author

ysh329 commented Oct 12, 2023

Hi all, I found only one commit left:

commit 13b487fa2d3c06a12cd9d76ec2e5a392b5eeb778 (HEAD -> main, origin/main, origin/HEAD)
Author: Tlopex <68688494+tlopex@users.noreply.github.com>
Date:   Wed Oct 11 23:21:50 2023 +0800

    [TFLite][Frontend] Support quantized ELU (#15821)
    
    * add quantized elu
    
    * add tests for quantized elu

commit 9f562b0c728eff347b27afbf14d5c2137b7e8e4d
Author: ysh329 <ysh329@users.noreply.github.com>
Date:   Wed Oct 11 21:51:45 2023 +0800

    [release] Update version to 0.14.0 and 0.15.0.dev on main branch (#15847)
    
    * [release] Update version to 0.14.0 on main branch
    
    * [Release] Update version to 0.15.dev0 on main branch

commit 4e9866fef2e4553dd7614bea0afd8ac401c557fe
Author: Honglin Zhu <11612425@mail.sustech.edu.cn>
Date:   Wed Oct 11 17:16:44 2023 +0800

    [TIR] Fix the error example in the documentation for pad_einsum (#15906)
    
    fix the error example in pad_einsum documentation

I'm not sure whether we used merge without squash.

cc @Hzfengsy @tqchen

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.

3 participants