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.

Sign up for GitHub

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

Jump to bottom

Backport 2.0.1 changelog to develop, un-xfail admin test. #6040

Merged
merged 4 commits into from
Jul 12, 2021
Merged

Backport 2.0.1 changelog to develop, un-xfail admin test. #6040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ea25bc
SecureDrop 2.0.1-rc1
zenmonkeykstop Jul 6, 2021
7de7683
SecureDrop 2.0.1
zenmonkeykstop Jul 8, 2021
4721892
SecureDrop 2.1.0-rc1
zenmonkeykstop Jul 9, 2021
3723761
The test_update test should now pass, as a github release with a fres…
zenmonkeykstop Jul 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 0 additions & 2 deletions admin/tests/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,6 @@ def test_check_for_update_when_updates_not_needed(securedrop_git_repo):
assert child.signalstatus is None


# This test will fail until a tag with the 2021 signing key is pushed
@pytest.mark.xfail
@flaky(max_runs=3)
def test_update(securedrop_git_repo):
gpgdir = os.path.join(os.path.expanduser('~'), '.gnupg')
Expand Down
8 changes: 8 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@

## 2.1.0~rc1

## 2.0.1

### Operations

* Updated admin dependencies: cryptography from 3.2.1 to 3.4.7, cffi from 1.14.2 to 1.14.5 (#6030)

### Development

* Updated testinfra tests to use site-specific configuration against production instances (#6032)

## 2.0.0

Expand Down
10 changes: 8 additions & 2 deletions install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
securedrop-app-code (2.1.0~rc1+focal) focal; urgency=medium

* see changelog.md
*

-- SecureDrop Team <securedrop@freedom.press> Fri, 09 Jul 2021 15:40:20 -0400

securedrop-app-code (2.0.1+focal) focal; urgency=medium

* see changelog.md

-- SecureDrop Team <securedrop@freedom.press> Thu, 24 Jun 2021 12:17:15 -0400
-- SecureDrop Team <securedrop@freedom.press> Thu, 08 Jul 2021 13:32:06 -0400

securedrop-app-code (2.0.0+focal) focal; urgency=medium

Expand Down
2 changes: 1 addition & 1 deletion molecule/shared/stable.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.0.1