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

SecureDrop 1.8.1-rc1 - version bump and cherry-picked changes. #5890

Merged
merged 11 commits into from
Apr 7, 2021

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Apr 7, 2021

Status

Ready for review

Description of Changes

Towards #5891

Initial RC for SecureDrop 1.8.1

Testing

@emkll emkll changed the title Securedrop 1.8.1-rc1 - version bump and cherry-picked changes. SecureDrop 1.8.1-rc1 - version bump and cherry-picked changes. Apr 7, 2021
@emkll emkll mentioned this pull request Apr 7, 2021
23 tasks
emkll
emkll previously approved these changes Apr 7, 2021
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.

changes look good to me, thanks @zenmonkeykstop . deb tests are failing due to builder image needing updates, we will do that on release day.

This is going to need a final rebase to resolve conflicts here (due to changes in release/1.8.1)

@emkll emkll dismissed their stale review April 7, 2021 20:03

conflicts

zenmonkeykstop and others added 6 commits April 7, 2021 16:10
On Ubuntu Focal installed from ISO, the "mokutil" package wasn't
installed by default. Let's add it early in the prepare-servers role, so
we can use it to check for SecureBoot status before proceeding with
installation.

(cherry picked from commit 9ec39d8)
Adds a new rules group and also the related decoder.

(cherry picked from commit d289c1a)
@zenmonkeykstop zenmonkeykstop force-pushed the cherrypicked-1.8.1-rc1 branch from 249cc7b to d4b0b43 Compare April 7, 2021 20:50
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.

Changes LGTM

zenmonkeykstop and others added 5 commits April 7, 2021 17:00
- pylint 2.5.0 -> 2.7.0 (python 3.6+ required, no review as dev only)
- pyyaml 5.3.1 -> 5.4.1 (python 3.6+ required, previously reviewed)

(cherry picked from commit 053463e)
Required in order to maintain support for Python 3.5, under Xenial.
The python-dateutil package pulls in whatever the latest setuptools-scm
version is, and as of setuptools_scm>=6, Python 3.5 is no longer
supported.

(cherry picked from commit dcee956)
We have to install the correct version of setuptools_scm in the
virtualenv created by the `dh-virtualenv` tool. This is managed
by:

https://github.com/spotify/dh-virtualenv/blob/0.11/dh_virtualenv/deployment.py#L145-L146

Only problem is that `pip` does not support hash verification when
used via command line.

(cherry picked from commit 68e7e9c)
@emkll emkll force-pushed the cherrypicked-1.8.1-rc1 branch from d4b0b43 to 4bdccbf Compare April 7, 2021 21:01
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.

Squashed changelog edits into a single commit, with no changes to the diff:
https://github.com/freedomofpress/securedrop/compare/d4b0b43..4bdccbf

Should be good to merge when CI passes

@emkll emkll merged commit 8d5430d into release/1.8.1 Apr 7, 2021
@emkll emkll deleted the cherrypicked-1.8.1-rc1 branch April 7, 2021 22:16
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.

4 participants