Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conditionally override version after cutting a release branch #5483

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from

Conversation

kenodegard
Copy link
Contributor

Description

The first canary build created after cutting a release branch produces a misleading version/build string. Instead of deriving the version/build string from the upcoming release, it uses the version from the most recent release on main. This leads to a race condition with packages produced by the canary build workflow from the main branch.

The race condition occurs because both main and the release branch end up generating packages with the same version/build string. Even though we upload them to anaconda.org with different labels, only one package would "win." As a result, we occasionally see the package first appear under one label, only to disappear and reappear under the other label when the other canary build workflow finishes and uploads it's packages.

The proposed fix is to override the default behavior of git describe --tag when no releases have been made on the branch yet.

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Sep 11, 2024
Copy link

codspeed-hq bot commented Sep 11, 2024

CodSpeed Performance Report

Merging #5483 will not alter performance

Comparing kenodegard:recipe-version-override (414d2f9) with main (adfdc2a)

Summary

✅ 3 untouched benchmarks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Status: 👀 In Review
Development

Successfully merging this pull request may close these issues.

2 participants