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

Docs port release 1.4.0 branch to master #5323

Closed
wants to merge 406 commits into from

Conversation

conorsch
Copy link
Contributor

@conorsch conorsch commented Jun 17, 2020

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:

git checkout master
git pull origin master
git checkout release/1.4.0
git pull origin release/1.4.0
git checkout -b docs-port-release-1.4.0-branch-to-master
git rebase -i master 

Then I manually dropped all commits before the 1.3.0 release commit. I'd previously run this command locally, which succeeded without conflicts:

git merge --strategy=recursive --strategy-option=theirs release/1.4.0

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 to master (or docs, 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:

  1. Upgrading existing production instances.
  2. New installs.

Checklist

If you made changes to the server application code:

  • Linting (make lint) and tests (make test) pass in the development container

If you made changes to securedrop-admin:

  • Linting and tests (make -C admin test) pass in the admin development container

If you made changes to the system configuration:

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

If you made changes to documentation:

  • Doc linting (make docs-lint) passed locally

If you added or updated a code dependency:

Choose one of the following:

  • I have performed a diff review and pasted the contents to the packaging wiki
  • I would like someone else to do the diff review

Allie Crevier and others added 30 commits February 6, 2020 14:52
added --preserve-tor-config flag to securedrop-admin restore
updated pip commands in scripts and docs to include --no-deps flag
Add 1.2.0 to 1.2.1 update guide for workstations
(cherry picked from commit f3c28c1)
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`
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)
Clarify ordering of a few operations in release management docs
added functionality to load test data during staging provisioning
…ersion

updated markupsafe dependency to 1.1.1
rmol and others added 17 commits June 3, 2020 15:01
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)
Remove unused screenshot

(cherry picked from commit 4f0f77e)
- 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
@eloquence
Copy link
Member

It looks like some docs changes got lost along the way, per git diff docs-port-release-1.4.0-branch-to-master release/1.4.0 output

@lgtm-com
Copy link

lgtm-com bot commented Jun 17, 2020

This pull request fixes 1 alert when merging c6f348c into f6bbe6c - view on LGTM.com

fixed alerts:

  • 1 for Unmatchable dollar in regular expression

@conorsch conorsch force-pushed the docs-port-release-1.4.0-branch-to-master branch from c6f348c to dfe5624 Compare June 18, 2020 00:15
@lgtm-com
Copy link

lgtm-com bot commented Jun 18, 2020

This pull request fixes 1 alert when merging dfe5624 into f6bbe6c - view on LGTM.com

fixed alerts:

  • 1 for Unmatchable dollar in regular expression

@conorsch conorsch force-pushed the docs-port-release-1.4.0-branch-to-master branch from dfe5624 to bca8519 Compare June 18, 2020 00:24
@conorsch
Copy link
Contributor Author

Superseded by #5325

@conorsch conorsch closed this Jun 18, 2020
@conorsch conorsch deleted the docs-port-release-1.4.0-branch-to-master branch June 18, 2020 21:54
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.

None yet