Commit bdb880fe authored by intrigeri's avatar intrigeri
Browse files

Special-case feature/bullseye instead of feature/buster (refs: #16945).

feature/buster is not a thing anymore.
parent 8290de3e
......@@ -33,19 +33,19 @@ CURRENT_BRANCH=$(git_current_branch)
if [ "$BASE_BRANCH" = stable ] \
|| [ "$BASE_BRANCH" = testing ] \
|| ( git_on_a_tag && [ "$CURRENT_BRANCH" = feature/buster ] ) \
|| ( git_on_a_tag && [ "$CURRENT_BRANCH" = feature/bullseye ] ) \
then
case "$ARCHIVE" in
debian-security)
[ "$SERIAL" = latest ] \
|| fatal "APT snapshots are frozen for the debian-security archive," \
"which should happen neither on feature/buster nor on" \
"which should happen neither on feature/bullseye nor on" \
"a branch based on $BASE_BRANCH"
;;
*)
[ "$SERIAL" != latest ] \
|| fatal "APT snapshots are not frozen for the $ARCHIVE archive," \
"which should happen neither on feature/buster nor on" \
"which should happen neither on feature/bullseye nor on" \
"a branch based on $BASE_BRANCH"
esac
if version_was_released "$(version_in_changelog)"; then
......@@ -61,10 +61,10 @@ then
output_time_based_snapshot "$ARCHIVE" "$RESOLVED_SERIAL"
fi
else
if [ "$BASE_BRANCH" = devel ] || [ "$CURRENT_BRANCH" = feature/buster ]; then
if [ "$BASE_BRANCH" = devel ] || [ "$CURRENT_BRANCH" = feature/bullseye ]; then
if [ "$SERIAL" != latest ]; then
fatal "APT snapshots are frozen, which should happen neither on" \
"feature/buster nor on a branch based on the devel one"
"feature/bullseye nor on a branch based on the devel one"
fi
fi
output_time_based_snapshot "$ARCHIVE" "$RESOLVED_SERIAL"
......
......@@ -314,15 +314,15 @@ Update other base branches
during the freeze. It's fine if that results in a no-op
(it depends on how exactly previous operations were performed).
3. Merge `devel` into `feature/buster`, *without* following the instructions for
3. Merge `devel` into `feature/bullseye` (if it exists), *without* following the instructions for
[[merging base branches|APT_repository/custom#workflow-merge-main-branch]].
(For now `feature/buster` is handled as any other topic branch
(For now `feature/bullseye` is handled as any other topic branch
forked off `devel`: its base branch is set to `devel`.)
If the merge conflicts don't look like something you feel confident
resolving properly, abort this merge and let the Foundations
Team know.
4. Ensure that the release, `devel` and `feature/buster` branches
4. Ensure that the release, `devel` and `feature/bullseye` (if it exists) branches
have the expected content in `config/APT_overlays.d/`: e.g. it must
not list any overlay APT suite that has been merged already.
......@@ -330,7 +330,7 @@ Update other base branches
git push origin \
"${RELEASE_BRANCH:?}:${RELEASE_BRANCH:?}" \
feature/buster:feature/buster \
$(if git describe feature/bullseye >/dev/null 2>&1; then echo feature/bullseye:feature/bullseye ; fi) \
devel:devel
Update more included files
......
Markdown is supported
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