-
Notifications
You must be signed in to change notification settings - Fork 46
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
Updates rc naming convention in RPM spec #554
Conversation
This reverts commit fcaa567.
This reverts commit 294f58a.
Following the conventions in [0], we now update both the "Version" and "Release" fields in order to handle RPMs. Some additional munging of the "Source0" and "%setup" lines is warranted, as well, to build the correct filepaths when using a hyphen in the full version spec, e.g. 0.3.0-rc1. [0] https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_prerelease_versions
fb98f6b
to
c73e664
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @conorsch changes look good to me. I'll let you review/comment/merge as I've appended the 0.3.0-rc1 release commit and associated changelog. Tested as follows:
- Versioning scheme makes sense (see discussion in Create staging release candidate #540, cf. Provide release candidate for 0.3.0 series #552)
- Changes from SecureDrop Workstation 0.3.0~rc1 #550 reverted cleanly
- Changes to
update_version.sh
work as expected:-
./update_version.sh 0.3.0-rc1
increments and proper sdist naming for tarball and source location, and the package builds usingmake dom0-rpm
-
./update_version.sh 0.3.0-rc2
increments the version correctly, and package builds usingmake dom0-rpm
-
./update_version.sh 0.3.0
increments the version correctly, and package builds usingmake dom0-rpm
-
- Ensure
0.3.0
>0.3.0-rc1
>0.3.0-rc2
: Created three rpms and observe the output ofdnf install $RPM
and observe the upgrade/downgrade message at the confirmation prompt. - The resulting rpm on this branch works in dom0 (sudo dnf install and
./securedrop-admin --apply
)
Looks great, @emkll. After visually reviewing your additions, I bumped versions locally and confirmed upgrade/downgrade behavior:
Proceeding with merge, then we'll submit a follow-up PR to https://github.com/freedomofpress/securedrop-workstation-dev-rpm-packages-lfs (in particular, see freedomofpress/securedrop-yum-test#8 for reference). |
Updates rc naming convention in RPM spec
Status
Ready for review.
Description of Changes
Refs #540. Supersedes and therefore closes #552.
Changes proposed in this pull request:
Following the conventions in [0], we now update both the "Version" and
"Release" fields in order to handle RPMs. Some additional munging of the
"Source0" and "%setup" lines is warranted, as well, to build the correct
filepaths when using a hyphen in the full version spec, e.g. 0.3.0-rc1.
[0] https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_prerelease_versions
The "version" hasn't yet been bumped in this PR, after testing locally, please append a commit with results of
./update-version.sh 0.3.0-rc1
.Testing
update_version.sh
work as expected:./update_version.sh 0.3.0-rc1
increments and proper sdist naming for tarball and source location, and the package builds usingmake dom0-rpm
./update_version.sh 0.3.0-rc2
increments the version correctly, and package builds usingmake dom0-rpm
./update_version.sh 0.3.0
increments the version correctly, and package builds usingmake dom0-rpm
0.3.0
>0.3.0-rc1
: Create two rpms and observe the output ofdnf install $RPM
and observe the upgrade/downgrade message at the confirmation prompt../securedrop-admin --apply
)Checklist
If you have made code changes
make flake8
) passes in the development environment (this box maybe left unchecked, as
flake8
also runs in CI)If you have made changes to the provisioning logic
All tests (
make test
) pass indom0
of a Qubes installThis PR adds/removes files, and includes required updates to the packaging
logic in
MANIFEST.in
andrpm-build/SPECS/securedrop-workstation-dom0-config.spec