Skip to content

Commit

Permalink
Merge pull request #30 from freedomofpress/release-management-and-sec…
Browse files Browse the repository at this point in the history
…uredrop-builder

Consolidate and update workstation release management process
  • Loading branch information
gonzalo-bulnes committed Feb 22, 2023
2 parents 4c2460f + 6cf5127 commit c49f2bf
Show file tree
Hide file tree
Showing 5 changed files with 193 additions and 214 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@
"https://forum.securedrop.org/admin/users/list/active",
"https://weblate.securedrop.org/projects/securedrop/securedrop/#announcement",
"https://weblate.securedrop.org/projects/securedrop/securedrop/#repository",
"https://github.com/freedomofpress/securedrop-debian-packages-lfs",
"https://github.com/freedomofpress/securedrop-apt-prod",
r"https://weblate.securedrop.org/accounts/profile/.*",
r"https://github.com/freedomofpress/securedrop/issues/.*",
r"https://github.com/freedomofpress/securedrop/tree/.*",
Expand Down
6 changes: 3 additions & 3 deletions docs/release_management.rst
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ Pre-Release

c. Build logs should be saved and published according to the `build log guidelines
<https://github.com/freedomofpress/securedrop/wiki/Build-logs>`_.
d. Open a PR on `securedrop-dev-packages-lfs
<https://github.com/freedomofpress/securedrop-dev-packages-lfs>`_ that targets the ``main``
d. Open a PR on `securedrop-apt-test
<https://github.com/freedomofpress/securedrop-apt-test>`_ that targets the ``main``
branch with the new debs. Do not include tarballs or any debs that would overwrite
existing debs. Changes merged to this branch will be published to ``apt-test.freedom.press``
within 15 minutes.
Expand Down Expand Up @@ -238,7 +238,7 @@ Release Process
log guidelines
<https://github.com/freedomofpress/securedrop/wiki/Build-logs>`_.
#. In a clone of the private
`securedrop-debian-packages-lfs <https://github.com/freedomofpress/securedrop-debian-packages-lfs>`_
`securedrop-apt-prod <https://github.com/freedomofpress/securedrop-apt-prod>`_
repository, create a branch from ``main`` called ``release``.
#. In your local branch, commit the built packages to the ``core/focal``
directory.
Expand Down
6 changes: 3 additions & 3 deletions docs/updating_tor.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ Announcements for new Tor releases are posted in the `Tor forum
<https://forum.torproject.net/c/news/tor-release-announcement/28>`_.

Our continuous integration automatically checks for new Tor packages every
night and should commit them to the `securedrop-dev-packages-lfs
<https://github.com/freedomofpress/securedrop-dev-packages-lfs>`_ repository.
night and should commit them to the `securedrop-apt-test
<https://github.com/freedomofpress/securedrop-apt-test>`_ repository.
Within 15 minutes they should be available for download via
``apt-test.freedom.press``.

Expand All @@ -32,5 +32,5 @@ Promoting
---------

To promote a Tor release to production, copy the ``*.deb`` files over to the
`securedrop-debian-packages-lfs <https://github.com/freedomofpress/securedrop-debian-packages-lfs>`_
`securedrop-apt-prod <https://github.com/freedomofpress/securedrop-apt-prod>`_
repository and follow those instructions.
2 changes: 1 addition & 1 deletion docs/workstation_development.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Building workstation deb packages

Debian packages for the SecureDrop Workstation components are maintained
in a separate repository:
https://github.com/freedomofpress/securedrop-debian-packaging/
https://github.com/freedomofpress/securedrop-builder/

Building workstation rpm packages
---------------------------------
Expand Down
Loading

0 comments on commit c49f2bf

Please sign in to comment.