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

Updates rc naming convention in RPM spec #554

Merged
merged 4 commits into from
May 19, 2020
Merged

Conversation

conorsch
Copy link
Contributor

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

  • 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 using make dom0-rpm
    • ./update_version.sh 0.3.0-rc2 increments the version correctly, and package builds using make dom0-rpm
    • ./update_version.sh 0.3.0 increments the version correctly, and package builds using make dom0-rpm
  • Ensure 0.3.0 > 0.3.0-rc1: Create two rpms and observe the output of dnf 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)

Checklist

If you have made code changes

  • Linter (make flake8) passes in the development environment (this box may
    be left unchecked, as flake8 also runs in CI)

If you have made changes to the provisioning logic

  • All tests (make test) pass in dom0 of a Qubes install

  • This PR adds/removes files, and includes required updates to the packaging
    logic in MANIFEST.in and rpm-build/SPECS/securedrop-workstation-dom0-config.spec

emkll and others added 3 commits May 14, 2020 11:49
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
@conorsch conorsch requested review from kushaldas, emkll and rmol May 19, 2020 15:32
@emkll emkll force-pushed the 540-rc-version-spec branch from fb98f6b to c73e664 Compare May 19, 2020 16:56
Copy link
Contributor

@emkll emkll left a 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 using make dom0-rpm
    • ./update_version.sh 0.3.0-rc2 increments the version correctly, and package builds using make dom0-rpm
    • ./update_version.sh 0.3.0 increments the version correctly, and package builds using make dom0-rpm
  • Ensure 0.3.0 > 0.3.0-rc1 > 0.3.0-rc2: Created three rpms and observe the output of dnf 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)

@conorsch
Copy link
Contributor Author

Looks great, @emkll. After visually reviewing your additions, I bumped versions locally and confirmed upgrade/downgrade behavior:

  • 0.3.0-rc1 -> 0.3.0-rc2 -> 0.3.0 showed "upgrade" in dnf output
  • 0.3.0 -> 0.3.0-rc2 -> 0.3.0-rc1 showed "downgrade" in dnf output

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).

@conorsch conorsch merged commit 86b988a into master May 19, 2020
cfm pushed a commit that referenced this pull request Apr 1, 2024
Updates rc naming convention in RPM spec
@legoktm legoktm deleted the 540-rc-version-spec branch May 28, 2024 15:25
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.

2 participants