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

Backport 2.11.1 changelog, update development version to 2.12.0-rc1 #7399

Merged
merged 6 commits into from
Dec 20, 2024

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Dec 19, 2024

Status

Ready for review / Work in progress

Description of Changes

Fixes #7372.
Fixes #7395

Changes proposed in this pull request:

Testing

  • base is develop
  • CI is green
  • changelog now includes 2.11.0 and 2.11.1 updates
  • version updated to 2.12.0~rc1

zenmonkeykstop and others added 2 commits December 19, 2024 16:40
(cherry picked from commit 02b055c)
Co-authored-by: Cory Francis Myers <[email protected]>
(cherry picked from commit 15c2c5a)
@zenmonkeykstop zenmonkeykstop requested a review from a team as a code owner December 19, 2024 21:48
@legoktm legoktm self-assigned this Dec 19, 2024
Copy link
Member

@legoktm legoktm left a comment

Choose a reason for hiding this comment

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

Can you also cherry-pick 6de091d?

legoktm and others added 4 commits December 19, 2024 17:29
test_apparmor_conditional is failing in CI because it ends up finding
the dbgsym package instead of the actual deb (similar to f5e06b1).

Fix by just ignoring dbgsym packages entirely.

(cherry picked from commit 6de091d)
(cherry picked from commit c6fbdca)
(cherry picked from commit 9a1e7ab)
Copy link
Member

@legoktm legoktm left a comment

Choose a reason for hiding this comment

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

Thanks!

@legoktm legoktm added this pull request to the merge queue Dec 20, 2024
Merged via the queue into develop with commit f81a64b Dec 20, 2024
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Release SecureDrop 2.11.1 Release SecureDrop 2.11.0
3 participants