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

Remove files related to Debian packaging, now in client repo #490

Merged
merged 1 commit into from
Feb 9, 2024

Conversation

legoktm
Copy link
Member

@legoktm legoktm commented Feb 6, 2024

All of the packaging logic has moved to the securedrop-client repository, leaving this responsible for the localwheels building. (RPM nightlies will be moved out at a later time.)

Nearly everything has been migrated, the things that haven't (lint-desktop-files, test_deb_package.py and clean-old-packages) have open issues/PRs for them.

One explicit workflow change is that PRs to this repo will not test
package builds, because doing so causes a catch-22 scenario when the
build-requirements.txt in the client repo hasn't been updated yet, so it
fails.

@legoktm legoktm force-pushed the rm-packaging branch 2 times, most recently from 6c6ca1e to 608744f Compare February 6, 2024 15:59
@legoktm legoktm marked this pull request as ready for review February 6, 2024 16:00
All of the packaging logic has moved to the securedrop-client
repository, leaving this responsible for the localwheels building. (RPM
nightlies will be moved out at a later time.)

Nearly everything has been migrated, the things that haven't
(lint-desktop-files, test_deb_package.py and clean-old-packages) have
open issues/PRs for them.

One explicit workflow change is that PRs to this repo will not test
package builds, because doing so causes a catch-22 scenario when the
build-requirements.txt in the client repo hasn't been updated yet, so it
fails.
@legoktm legoktm force-pushed the rm-packaging branch 2 times, most recently from 0e921f8 to 04b6481 Compare February 8, 2024 18:30
@rocodes rocodes self-assigned this Feb 9, 2024
@rocodes rocodes self-requested a review February 9, 2024 14:42
Copy link
Contributor

Choose a reason for hiding this comment

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

I noticed this file isn't present in securedrop-client after the refactor changes. Is that intentional?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, we are no longer using dh-virtualenv so there's no trigger for us to register on to. (And the triggers file was mostly useless too, c.f. freedomofpress/securedrop#6231)

Copy link
Contributor

Choose a reason for hiding this comment

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

Same as previous - I may be missing something about the refactor but are we missing some workstation-viewer package config in the client repo now?

Copy link
Member Author

Choose a reason for hiding this comment

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

The workstation-viewer package is just a "metapackage", it doesn't contain any files of its own, just depends on other packages, so it's fully contained in the d/control file now: https://github.com/freedomofpress/securedrop-client/blob/main/debian/control#L47

best way to verify this is build the new debs in the client, grab an old deb from apt-prod and diffoscope them :)

Copy link
Contributor

@rocodes rocodes left a comment

Choose a reason for hiding this comment

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

Thank you @legoktm for all the work :) Left a couple clarification questions re: changes between here and the client repo (around the .triggers files and the workstation-viewer package). Otherwise LGTM

@legoktm legoktm requested a review from rocodes February 9, 2024 17:02
Copy link
Contributor

@rocodes rocodes 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 clarifications @legoktm - lvgtm

@rocodes rocodes merged commit 639161e into main Feb 9, 2024
6 checks passed
@rocodes rocodes deleted the rm-packaging branch February 9, 2024 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants