-
Notifications
You must be signed in to change notification settings - Fork 681
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
Docs port release 1.4.0 branch to master #5323
Closed
Closed
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
remove feature to change codename
added --preserve-tor-config flag to securedrop-admin restore
updated pip commands in scripts and docs to include --no-deps flag
Update builder image
Add 1.2.0 to 1.2.1 update guide for workstations
(cherry picked from commit f3c28c1)
Add 1.2.1 changes to changelog
Update pylint to get a new version of astroid so that we can lint under Python 3.7. Update mypy to update typed-ast to a version compatible with the new version of astroid. Fix an obscure string formatting error in a test assertion that was caught by the new mypy.
Update version to 1.2.1 final in docs, update images, and the Debian package changelog. Everywhere else it's still 1.3.0~rc1 (cherry picked from commit eba66c3)
Added `testinfra` target to makefile that runs `molecule test`
Update version after 1.2.1
The old instruction to "Prepare a changelog describing the changes in the release" sounded like you should be updating the changelog files at that point, when that happens automatically during the execution of "update_version.sh". Also improved some indentation to clarify flow, and switched to auto-enumerated lists to avoid having to renumber when steps are added or deleted. For upgrade testing, removed the suggestion to build upgrade boxes on develop for point releases.
(cherry picked from commit 95c3e58)
…oxes Add 1.2.1 upgrade testing boxes
Clarify ordering of a few operations in release management docs
added functionality to load test data during staging provisioning
Update pylint, astroid, mypy
…ersion updated markupsafe dependency to 1.1.1
updated TBB version to 9.0.5
Update syntax for type annotations
Improve the validation of nameservers in securedrop-admin. In addition to validating the configuration in the "sdconfig" operation, check the configuration loaded during "install", to make sure it complies with current specifications.
…guration Improve nameserver configuration
Add checksdconfig.py to both securedrop-ossec-agent and securedrop-ossec-server, so that the configuration of both app and mon servers can be checked.
Add system configuration check script to securedrop-ossec packages
update make target fetch-tor-packages to download 0.4.3.5
(cherry picked from commit 9c19532)
Updates builder image for 2020-06-17
(cherry picked from commit 0be437a)
Remove unused screenshot (cherry picked from commit 4f0f77e)
(cherry picked from commit 18abce2)
- Fix to pre-existing singular/plural issue - Clarify example - Add note about fetching fresh gpg key (cherry picked from commit aa2d969)
(cherry picked from commit 359a619)
[1.4.0] Backport recent documentation improvements and upgrade guide
conorsch
requested review from
emkll,
kushaldas,
redshiftzero and
zenmonkeykstop
as code owners
June 17, 2020 23:34
It looks like some docs changes got lost along the way, per |
This pull request fixes 1 alert when merging c6f348c into f6bbe6c - view on LGTM.com fixed alerts:
|
conorsch
force-pushed
the
docs-port-release-1.4.0-branch-to-master
branch
from
June 18, 2020 00:15
c6f348c
to
dfe5624
Compare
This pull request fixes 1 alert when merging dfe5624 into f6bbe6c - view on LGTM.com fixed alerts:
|
conorsch
force-pushed
the
docs-port-release-1.4.0-branch-to-master
branch
from
June 18, 2020 00:24
dfe5624
to
bca8519
Compare
Superseded by #5325 |
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
Towards #5289
Pulls in the 1.4.0-related changes to the master branch, for use with docs. I generated this changeset by running:
Then I manually dropped all commits before the 1.3.0 release commit. I'd previously run this command locally, which succeeded without conflicts:
But the change set included far too many old commits. We definitely need a more clearly documented workflow for porting changes from the
release/*
branch tomaster
(ordocs
, see #5321). The problems I encountered today were not unlike those in:Testing
How should the reviewer test this PR?
Write out any special testing steps here.
Deployment
Any special considerations for deployment? Consider both:
Checklist
If you made changes to the server application code:
make lint
) and tests (make test
) pass in the development containerIf you made changes to
securedrop-admin
:make -C admin test
) pass in the admin development containerIf you made changes to the system configuration:
If you made non-trivial code changes:
If you made changes to documentation:
make docs-lint
) passed locallyIf you added or updated a code dependency:
Choose one of the following: