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

Update publish_release action to commit and push PrintVersion.swift changes if needed #975

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

TTOzzi
Copy link
Member

@TTOzzi TTOzzi commented Apr 3, 2025

Related to #834

We had hoped that the version print issue would be fixed in the Swift 6.1 release, but unfortunately, it seems that it hasn’t been addressed.

As I understand it, swift-toolchain references swift-format by a specific branch(https://github.com/swiftlang/swift/blob/release/6.1/utils/update_checkout/update-checkout-config.json#L211), so the current behavior of the publish_release action — where the change to PrintVersion.swift is included only in a tag and not pushed to a branch — means that the update doesn’t make it into the distributed toolchain 🤔

This PR updates the publish_release action so that when PrintVersion.swift is updated, the change is committed and pushed to the branch as well.

It seems like another possible approach could be to have update-checkout-config in Swift point to a tag of swift-format instead of a branch — but I’m not sure which option would be better.

@TTOzzi TTOzzi force-pushed the actions-update-version branch 4 times, most recently from 29ac238 to 4fbe6e0 Compare April 3, 2025 17:53
@TTOzzi TTOzzi force-pushed the actions-update-version branch from 4fbe6e0 to 83668d8 Compare April 3, 2025 17:56
@bnbarham
Copy link
Contributor

bnbarham commented Apr 4, 2025

Unfortunately this is unlikely to have the intended effect, since publish_release is going to run around (and possibly after) the toolchain release. It's clear we need to do something here though 🤔

@TTOzzi
Copy link
Member Author

TTOzzi commented Apr 4, 2025

Unfortunately this is unlikely to have the intended effect, since publish_release is going to run around (and possibly after) the toolchain release. It's clear we need to do something here though 🤔

Oh, I see — so publish_release runs after the toolchain release…
We do run a prerelease using the same workflow before the official release, but since it uses a different version name (e.g. 601.0.0-prerelease-2025-03-28), that probably won’t help here.
Looks like we’ll need to explore a different approach 🤔

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.

2 participants