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

Debian build classification 'beta' cannot override 'release'. #5521

Merged
merged 1 commit into from
Mar 15, 2023

Conversation

ivaradi
Copy link
Contributor

@ivaradi ivaradi commented Mar 12, 2023

The Ubuntu/Debian build script classifies the built commit based on the tags, if any, pointing to the commit. This classification is used to determine the target PPA.

If no suitable tag points the commit, it will be an 'alpha' build. If a tag of the format 'vA.B.C' points to the commit, it will be a 'release' build, if the version is followed by something, e.g. 'vA.B.C-rc1', it will be a 'beta' build.

The current classification fails if both a 'beta' and a 'release' tag points to the commit, such as in case of the recent v3.7.4 release, where the '-rc1' tag points to the commit that was later released. It was deemed to be a 'beta' build. This patch fixes this behaviour to build such commits as 'release'es.

@ivaradi ivaradi force-pushed the fix-build-classification branch from 2f5ba28 to 9f4a6dc Compare March 12, 2023 13:31
@codecov
Copy link

codecov bot commented Mar 12, 2023

Codecov Report

Merging #5521 (9f4a6dc) into master (4b16a23) will decrease coverage by 0.07%.
The diff coverage is n/a.

❗ Current head 9f4a6dc differs from pull request most recent head 0e455bd. Consider uploading reports for the commit 0e455bd to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5521      +/-   ##
==========================================
- Coverage   59.00%   58.94%   -0.07%     
==========================================
  Files         143      143              
  Lines       18313    18313              
==========================================
- Hits        10805    10794      -11     
- Misses       7508     7519      +11     

see 1 file with indirect coverage changes

@ivaradi
Copy link
Contributor Author

ivaradi commented Mar 12, 2023

@claucambra thanks for the approval. Could you, please, also merge it? I think the check failures are unrelated to the patch, but I cannot merge due to them.

Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

thanks
@ivaradi sorry for the extra work
I really wanted to be able to test the release before pushing the real tag

@mgallien mgallien force-pushed the fix-build-classification branch from 9f4a6dc to 0e455bd Compare March 14, 2023 15:11
@ivaradi
Copy link
Contributor Author

ivaradi commented Mar 14, 2023

thanks @ivaradi sorry for the extra work I really wanted to be able to test the release before pushing the real tag

No problem. I think it's a valid use-case to release a final release candidate.

The Ubuntu/Debian build script classifies the built commit based
on the tags, if any, pointing to the commit. This classification
is used to determine the target PPA.

If no suitable tag points the commit, it will be an 'alpha'
build. If a tag of the format 'vA.B.C' points to the commit,
it will be a 'release' build, if the version is followed by
something, e.g. 'vA.B.C-rc1', it will be a 'beta' build.

The current classification fails if both a 'beta' and
a 'release' tag points to the commit, such as in case of
the recent v3.7.4 release, where the '-rc1' tag points to the
commit that was later released. It was deemed to be a 'beta'
build. This patch fixes this behaviour to build such commits
as 'release'es.

Signed-off-by: István Váradi <[email protected]>
@mgallien mgallien force-pushed the fix-build-classification branch from 0e455bd to 5dacf60 Compare March 14, 2023 16:15
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5521-5dacf60fae55c96df16f36a0411fed1ce5971d5c-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien merged commit a0e32d9 into nextcloud:master Mar 15, 2023
@mgallien mgallien added this to the 3.8.0 milestone Mar 21, 2023
@ivaradi ivaradi deleted the fix-build-classification branch September 16, 2024 09:50
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.

4 participants