SecureDrop Workstation 0.3.0~rc1 #550
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Preserving the SecureDrop Core scheme, this will allow us to support release canadidates for the workstation provisioning code. Pre-release separators for RPMs[1] are `~`, while not supported in Python (per PEP440)[2], and overwriting them to `-`. We should modify the RPM spec to specify the source folder and tarballs to take into account this path change. Thanks to @kushaldas for recommending the use of `%prep` and `%setup -n <path>` here. [1]: https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_versioning_prereleases_with_tilde [2]: https://www.python.org/dev/peps/pep-0440/#pre-release-separators
conorsch
approved these changes
May 12, 2020
There was a problem hiding this comment.
- changelog is accurate
- changes to
update_version.shwork as expected:-
./update_version.sh 0.4.0~rc1increments and proper sdist naming for tarball and source location, and the package builds usingmake dom0-rpm -
./update_version.sh 0.4.0increments the version correctly, and package builds usingmake dom0-rpm
-
- (Optional, this was already tested) Ensure
0.3.0>0.3.0~rc1: Create two rpms (0.3.0~rc1from this branch, and run./update_version.shto bump to 0.3.0), and observe the output ofdnf install $RPMand observe the upgrade/downgrade message at the confirmation prompt. - (Optional, this was already tested) the resulting rpm on this branch works in dom0 (sudo dnf install and
./securedrop-admin --apply)
This was referenced May 12, 2020
11 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
Fixes #540, towards #548 :
Packaging scripts now support release candidate version strings, increment version to
0.3.0~rc1. We use the same naming conversion as in SecureDrop core, where the~rcNsuffix will specify a (pre)release candidate for a given release.Testing
update_version.shwork as expected:./update_version.sh 0.4.0~rc1increments and proper sdist naming for tarball and source location, and the package builds usingmake dom0-rpm./update_version.sh 0.4.0increments the version correctly, and package builds usingmake dom0-rpm0.3.0>0.3.0~rc1: Create two rpms (0.3.0~rc1from this branch, and run./update_version.shto bump to 0.3.0), and observe the output ofdnf install $RPMand observe the upgrade/downgrade message at the confirmation prompt../securedrop-admin --apply)