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

Use Git describe for the mixxx ppa #3824

Merged
merged 4 commits into from
May 4, 2021
Merged

Conversation

daschuer
Copy link
Member

@daschuer daschuer commented May 2, 2021

Locally it works. Hopefully after merge as well.

@github-actions github-actions bot added the build label May 2, 2021
CMakeLists.txt Outdated
string(REPLACE "_" "" CPACK_DEBIAN_DEBIAN_VERSION_EXTRA "${CPACK_DEBIAN_DEBIAN_VERSION_EXTRA}")
set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_DEBIAN_UPSTREAM_VERSION}-ppa1~${GIT_BRANCH}~git${GIT_COMMIT_COUNT}~bionic")
string(REPLACE "-" "~" CPACK_DEBIAN_PACKAGE_VERSION "${PACKAGE_VERSION}")
set(CPACK_DEBIAN_PACKAGE_RELEASE mixxx1)
Copy link
Member

Choose a reason for hiding this comment

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

Typo? If not, please add a comment why it's mixxx1.

Copy link
Member Author

Choose a reason for hiding this comment

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

No, but we may change it because that a bit unusual.

This is the package version. Ubuntu uses 0ubuntu1 where the first number is the debian version and the last number the patched version. Debian version packages dfsg1. The lint tools is complaining that we must not use one of these ending because we have not the debian/ubuntu email address.

Alternatives
ppa1
build1

Other option?

Copy link
Member

Choose a reason for hiding this comment

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

I don't care, we can keep using mixxx1, just add that explanation as a comment so other people don't think it's a typo when reading the code.

Copy link
Member Author

Choose a reason for hiding this comment

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

I have picked now just 1 for the least confusing version.

Copy link
Member

@Holzhaus Holzhaus left a comment

Choose a reason for hiding this comment

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

I can't test this, but code looks good to me.

Locally it works. Hopefully after merge as well.

The proof of the pudding is in the eating. I'll merge now.

@Holzhaus Holzhaus merged commit 30af05c into mixxxdj:2.3 May 4, 2021
@daschuer
Copy link
Member Author

daschuer commented May 5, 2021

The pudding tastes bad. Maybe a bit more sugar.

I will have a look. Something with that new path.

@Holzhaus
Copy link
Member

Holzhaus commented May 5, 2021

I will have a look. Something with that new path.

Ok, thanks for taking care. By the way, where do you see that it failed? Do you have a link? Launchpad is confusing.

@daschuer
Copy link
Member Author

daschuer commented May 5, 2021

This is really confusing. In such issues the upload is rejected and fails silently.

@daschuer daschuer deleted the ppaversion branch August 1, 2021 11:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants