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

Add support for Ubuntu 24.04 (Noble) and Fedora 40 #779

Merged
merged 5 commits into from
Apr 24, 2024
Merged

Add support for Ubuntu 24.04 (Noble) and Fedora 40 #779

merged 5 commits into from
Apr 24, 2024

Conversation

apyrgio
Copy link
Contributor

@apyrgio apyrgio commented Apr 17, 2024

This PR adds support for Ubuntu 24.04 (Noble) and Fedora 40. Code-wise, thankfully, we don't need to make a change, but we still need to extend our CI scripts.

Unfortunately, we are unable to build Dangerzone .deb packages in Ubuntu Noble. Still, this issue does not really bite us yet, since we build production .deb packages in Debian Bookworm, and our tests already cover that.

Note

This PR should be merged after #778.

Refs #773
Closes #762

dev_scripts/env.py Outdated Show resolved Hide resolved
dev_scripts/env.py Outdated Show resolved Hide resolved
dev_scripts/env.py Outdated Show resolved Hide resolved
@apyrgio
Copy link
Contributor Author

apyrgio commented Apr 18, 2024

Thanks for the extra 👀 @naglis, super appreciated!

Copy link
Contributor

@deeplow deeplow left a comment

Choose a reason for hiding this comment

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

Thanks for the PR. Here are a few things I spotted:

  • Shouldn't we also have .github/workflows/check_repos.yml
  • BUILD.md has a note about Ubuntu 22.04 having issues with conmon. Have you checked if this also applies to 24.04? (I suspect it has a recent enough version, but just wanted to note it)
  • RELEASE.md we could bump latest version names (both for ubuntu and fedora) just so the instructions don't feel outdated. In practice this doesn't make much of difference.

.circleci/config.yml Show resolved Hide resolved
@apyrgio
Copy link
Contributor Author

apyrgio commented Apr 22, 2024

Shouldn't we also have .github/workflows/check_repos.yml

Yeah, but since those two are new distros, there's no Dangerzone package in them. We have to add this check after the release. I can track it in a separate issue, if you prefer.

BUILD.md has a note about Ubuntu 22.04 having issues with conmon. Have you checked if this also applies to 24.04? (I suspect it has a recent enough version, but just wanted to note it)

Yeap, I've checked and we're good.

RELEASE.md we could bump latest version names (both for ubuntu and fedora) just so the instructions don't feel outdated. In practice this doesn't make much of difference.

Hm, those versions are not out yet, so at the time of writing this, Fedora 39 and Ubuntu 22.04 are still the correct choices. Still, this is not a user-facing doc, so we can break the rules a bit and future-proof it. Fixed in 7f39669.

@deeplow
Copy link
Contributor

deeplow commented Apr 22, 2024

Shouldn't we also have .github/workflows/check_repos.yml

Yeah, but since those two are new distros, there's no Dangerzone package in them. We have to add this check after the release. I can track it in a separate issue, if you prefer.

The thing is that this is bumping INSTALL.md, but if we end up not publishing for these platforms due to blockers, it shouldn't be listed there.

Extend our CircleCI jobs to run CI tests in Ubuntu Noble.

This commit also adds support for building the Dangerzone .deb package
in Ubuntu Noble, but does not actually enable it. The reason is that
stdeb, which produces our Debian packages, does not work with Python
3.12, which ships with Ubuntu Noble

Refs #773
Extend our CircleCI jobs to:
* Build an .rpm package for Dangerzone in Fedora 40
* Run CI tests in Fedora 40
Extend our GitHub actions job to build an end-user environment for
Ubuntu Noble / Fedora 40, and then run a simple test in it.
@apyrgio
Copy link
Contributor Author

apyrgio commented Apr 23, 2024

The thing is that this is bumping INSTALL.md, but if we end up not publishing for these platforms due to blockers, it shouldn't be listed there.

We discussed this out of band. @deeplow was referring to this blocker:

Unfortunately, we are unable to build Dangerzone .deb packages in Ubuntu Noble. Still, this issue does not really bite us yet, since we build production .deb packages in Debian Bookworm, and our tests already cover that.

The thing here is that end-users are not affected by this issue. Only Ubuntu 24.04 (Noble) users who want to build this package from source. So, it's ok to start supporting this platform, even if #773 is not resolved yet.

With that covered, I have the green light to merge the PR.

@deeplow
Copy link
Contributor

deeplow commented Apr 24, 2024

Approved, pending the lint fix.

@apyrgio apyrgio merged commit b920de3 into main Apr 24, 2024
19 of 30 checks passed
@apyrgio apyrgio deleted the 762-bump branch April 24, 2024 11:32
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.

Prepare for Fedora 40 and Ubuntu 24.04
3 participants