Skip to content

infra: merge v1.7.7 release commits into main#196

Merged
rmshaffer merged 2 commits into
mainfrom
merge-v1.7.7-into-main
Jun 23, 2026
Merged

infra: merge v1.7.7 release commits into main#196
rmshaffer merged 2 commits into
mainfrom
merge-v1.7.7-into-main

Conversation

@rmshaffer

@rmshaffer rmshaffer commented Jun 23, 2026

Copy link
Copy Markdown
Member

The v1.7.7 tag (pushed 2026-06-10) points to commit 6b17614 ('infra: update pypi build step (#193)'), which was created on a release branch and never merged back to main.

This PR merges the v1.7.7 tag into main with --no-ff. The merge produces a merge commit with parents 48cd779 (current main) and 6b17614 (v1.7.7 tip), making the tag reachable from main. No files are changed by the merge — the publish-to-pypi.yml changes from #193 had already been re-applied to main via later commits, so this is purely an ancestry fix.

After this lands, the next release pipeline run will see v1.7.7 as the latest reachable tag and bump correctly from there.

The v1.7.7 tag points to commit 6b17614 which was created on a release
branch and never merged back to main. As a result, main's ancestry only
contains v1.7.6, so the release pipeline keeps recomputing the next
release as v1.7.7 and failing when it tries to push the already-existing
tag. Merging v1.7.7 into main makes the tag reachable from main so the
release bot will compute the next version from v1.7.7 going forward.
@rmshaffer rmshaffer merged commit cb251fb into main Jun 23, 2026
14 checks passed
@rmshaffer rmshaffer deleted the merge-v1.7.7-into-main branch June 23, 2026 21:20
@codecov

codecov Bot commented Jun 23, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 100.00%. Comparing base (48cd779) to head (5bd4f03).
⚠️ Report is 3 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##              main      #196   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files           34        34           
  Lines         1528      1528           
  Branches       200       200           
=========================================
  Hits          1528      1528           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant