Commit 9ba66da8 authored by intrigeri's avatar intrigeri
Browse files

Release process: fix base branches merging.

parent f95949f8
......@@ -332,6 +332,22 @@ After a new Tails release is out
### If you just put out a final release
If the release was a major one, then:
1. [[Hard reset the `stable` APT suite to
the state of the `testing` one|APT_repository/custom#workflow-reset]].
2. Empty `config/APT_overlays.d` in the `stable` branch:
git checkout stable && \
if [ $(find config/APT_overlays.d -maxdepth 1 -type f | wc -l) -gt 1 ]; then
git rm config/APT_overlays.d/* && \
git commit config/APT_overlays.d/ \
-m "Empty the list of APT overlays: they were merged"
fi
In any case:
* [[merge `stable` or `testing` into
`devel`|APT_repository/custom#workflow-merge-main-branch]]
* increment the version number in `devel`'s `debian/changelog` to match
......@@ -358,18 +374,6 @@ After a new Tails release is out
git commit debian/changelog \
-m "Add dummy changelog entry for ${NEXT_PLANNED_MINOR_VERSION:?}."
If the release was a major one, then:
1. [[Hard reset the stable APT suite to
the state of the testing one|APT_repository/custom#workflow-reset]].
2. Empty `config/APT_overlays.d` in the `stable` branch:
git checkout stable && \
git rm config/APT_overlays.d/* && \
git commit config/APT_overlays.d/ \
-m "Empty the list of APT overlays: they were merged"
### Else, if you just released a RC
* increment the version number in `debian/changelog` on the branch
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment