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

Adds changelog for SecureDrop 2.1.0-rc1 #6114

Merged
merged 1 commit into from
Sep 30, 2021

Conversation

zenmonkeykstop
Copy link
Contributor

Status

Ready for review

Description of Changes

Towards #6103 .

Includes changelog updates for 2.1.0 release

Testing

  • CI is passing
  • staging-test-with-rebase job does run
  • changelog additions make sense and capture the required changes in the release

@zenmonkeykstop zenmonkeykstop requested a review from a team as a code owner September 30, 2021 16:05
@zenmonkeykstop zenmonkeykstop changed the title SecureDrop 2.1.0-rc1 Adds changelog for SecureDrop 2.1.0-rc1 Sep 30, 2021
@conorsch
Copy link
Contributor

staging-test-with-rebase job does run

Hmm, that's not happening here. The related PRs are #6063 & #6086. Even after reading the CircleCI docs, the config looks correct to me. But the rebase job definitely hasn't run: https://app.circleci.com/pipelines/github/freedomofpress/securedrop/3028/workflows/8b890766-9b0d-470b-a03a-73aac999b78e

@conorsch
Copy link
Contributor

I appended a small change in an attempt to wake up CI, but no dice. However, I see that the rebase job did run on this branch last night, when it was created:

cci-rebase-on-release-branch

It's not displayed on the checks for this PR, and indeed it's not running on subsequent commits to this branch in PR state. Presumably that's because the current branch for this PR is update-2.1.0-rc1-changelog, which does not match ^release/.*, and therefore we should only expect it to run the staging job post-merge.

I'll drop the temporary commit and proceed with review, then follow-up post-merge with confirmation that the staging job ran.

@conorsch conorsch force-pushed the update-2.1.0-rc1-changelog branch from ce9475e to 6a3feaa Compare September 30, 2021 16:58
Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks for the detail, @zenmonkeykstop. After merge, I'll follow up with debs, as well as check on the staging job in CI, as mentioned above.

@conorsch conorsch merged commit 7275dce into release/2.1.0 Sep 30, 2021
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