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

Do not include config.py in built packages #7014

Merged
merged 1 commit into from
Oct 19, 2023
Merged

Conversation

legoktm
Copy link
Member

@legoktm legoktm commented Oct 18, 2023

Status

Ready for review

Description of Changes

Just like the custom_logo.png, we don't want to package config.py if it exists.

The absence of config.py is already verified by
test_securedrop_deb_package.py, but now you won't have to rebuild your packages since it won't be included at all.

Fixes #6973.

Testing

  • Run make securedrop/config.py
  • Run make build-debs
  • Post-package build tests pass, i.e. no config.py included in the package

Deployment

Any special considerations for deployment? No

Checklist

  • I have written a test plan and validated it for this PR

Just like the custom_logo.png, we don't want to package config.py
if it exists.

The absence of config.py is already verified by
test_securedrop_deb_package.py, but now you won't have to rebuild
your packages since it won't be included at all.

Fixes #6973.
@legoktm legoktm requested a review from a team as a code owner October 18, 2023 02:13
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

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

LGTM based on visual inspection, there's no situation in which we'd want to include a common config.py in a package.

@zenmonkeykstop zenmonkeykstop merged commit 7c1a9dd into develop Oct 19, 2023
12 checks passed
@zenmonkeykstop
Copy link
Contributor

(IMO we can get away without backporting this into the in-flight release as it will get caught by a test anyway...)

@legoktm legoktm deleted the debs-no-config branch October 19, 2023 16:11
@legoktm
Copy link
Member Author

legoktm commented Oct 19, 2023

Agreed, and real builds should be done from a fresh/clean git checkout so no config.py should exist.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

make build-debs doesn't explicitly ignore config.py
2 participants