This is an automated email from the ASF dual-hosted git repository.
sbp pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-release.git
The following commit(s) were added to refs/heads/main by this push:
new dce1f46 Fix the phase of the first preview revision
dce1f46 is described below
commit dce1f4621f8fa592fbda4fbcd9076686da4f0455
Author: Sean B. Palmer <[email protected]>
AuthorDate: Wed Sep 10 20:43:47 2025 +0100
Fix the phase of the first preview revision
---
atr/routes/resolve.py | 6 +++++-
atr/storage/writers/vote.py | 5 ++++-
atr/templates/revisions-selected.html | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/atr/routes/resolve.py b/atr/routes/resolve.py
index 6e4d047..12f4999 100644
--- a/atr/routes/resolve.py
+++ b/atr/routes/resolve.py
@@ -117,7 +117,10 @@ async def manual_selected_post(
release = await data.merge(release)
if vote_result == "passed":
release.phase = sql.ReleasePhase.RELEASE_PREVIEW
+ await data.commit()
+ await data.refresh(release)
success_message = "Vote marked as passed"
+
description = "Create a preview revision from the last candidate
draft"
async with revision.create_and_manage(
project_name, release.version, session.uid,
description=description
@@ -125,8 +128,9 @@ async def manual_selected_post(
pass
else:
release.phase = sql.ReleasePhase.RELEASE_CANDIDATE_DRAFT
+ await data.commit()
+ await data.refresh(release)
success_message = "Vote marked as failed"
- await data.commit()
if vote_result == "passed":
destination = finish.selected
else:
diff --git a/atr/storage/writers/vote.py b/atr/storage/writers/vote.py
index 0d176cc..0d4a14a 100644
--- a/atr/storage/writers/vote.py
+++ b/atr/storage/writers/vote.py
@@ -185,6 +185,8 @@ class CommitteeMember(CommitteeParticipant):
success_message = "Project PPMC vote marked as passed, and
Incubator PMC vote automatically started"
elif vote_result == "passed":
release.phase = sql.ReleasePhase.RELEASE_PREVIEW
+ await self.__data.commit()
+ await self.__data.refresh(release)
success_message = "Vote marked as passed"
description = "Create a preview revision from the last candidate
draft"
@@ -199,8 +201,9 @@ class CommitteeMember(CommitteeParticipant):
extra_destination = (round_one_email_address,
round_one_message_id)
else:
release.phase = sql.ReleasePhase.RELEASE_CANDIDATE_DRAFT
+ await self.__data.commit()
+ await self.__data.refresh(release)
success_message = "Vote marked as failed"
- await self.__data.commit()
error_message = await self.send_resolution(
release,
diff --git a/atr/templates/revisions-selected.html
b/atr/templates/revisions-selected.html
index 6b7de7a..ccec16b 100644
--- a/atr/templates/revisions-selected.html
+++ b/atr/templates/revisions-selected.html
@@ -123,7 +123,7 @@
{{ empty_form.hidden_tag() }}
<input type="hidden" name="revision_number" value="{{
revision.number }}" />
- <button type="submit" class="btn btn-sm
btn-outline-danger">Create a new revision from this</button>
+ <button type="submit" class="btn btn-sm
btn-outline-danger">Create a new revision from this one</button>
</form>
</div>
{% endif %}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
