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

rewords toolchain -development to 0.0.0 #900

Merged
merged 5 commits into from
Feb 19, 2025

Conversation

vincent-4
Copy link
Contributor

Made to be consistent with what we do in do in build.ps1 - use Swift\Toolchains\0.0.0+Asserts: this is the debug build, so use Asserts (not noAsserts)

This is one of 3 changes required. See PR for discussion with @compnerd

Find the PR originally filed at:
thebrowsercompany/swift-build#251

Find the original issue at
thebrowsercompany/swift-build#248

Copy link
Owner

@compnerd compnerd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that we can also drop the .xctoolchain suffix like we did with the installed layout.

vincent-4 added a commit to vincent-4/swift-build-cn that referenced this pull request Feb 12, 2025
@vincent-4
Copy link
Contributor Author

vincent-4 commented Feb 12, 2025

Thoughts on this? This is just the toolchain fix... I'll investigate the test stuff...

@compnerd
Copy link
Owner

This seems fairly reasonable to me. Going to kick off a test run once we get the CI back into working shape.

@compnerd
Copy link
Owner

Can you rebase the change please? I'd like to kick off a test run before merging.

@vincent-4
Copy link
Contributor Author

Yeah fs, doing so right now

vincent-4 added a commit to vincent-4/swift-build-cn that referenced this pull request Feb 14, 2025
@vincent-4 vincent-4 force-pushed the 248/rename-toolchain-000 branch 2 times, most recently from 168d417 to 08c9da9 Compare February 14, 2025 00:14
vincent-4 added a commit to vincent-4/swift-build-cn that referenced this pull request Feb 14, 2025
- Use inputs.swift_version instead of hardcoded values
- Update toolchain naming conventions
- Replace development with semantic version format
@vincent-4 vincent-4 force-pushed the 248/rename-toolchain-000 branch from 08c9da9 to 60f9958 Compare February 14, 2025 00:29
@vincent-4
Copy link
Contributor Author

I think I went overboard with the rebase stuff but it should be fine now...

@compnerd
Copy link
Owner

Shouldn't the expansion be ${{ inputs.swift_version }}?

@vincent-4
Copy link
Contributor Author

Shouldn't the expansion be ${{ inputs.swift_version }}?

Fixed it, my bad

@compnerd
Copy link
Owner

@vincent-4
Copy link
Contributor Author

Running a test at https://github.com/thebrowsercompany/swift-build/actions/runs/13323422484

Oh... seems to fail cause it can't find files.. is the change propagating properly?

@compnerd
Copy link
Owner

Yes, the change is propagating properly - there is something else that likely needs to change (either the staging for the packaging or possibly the install locations for the other stages). You will need to go through the logs and figure out where the file got installed and downloaded to.

@compnerd
Copy link
Owner

@compnerd
Copy link
Owner

Seems to have passed! I'm going to go ahead and merge this.

@compnerd compnerd merged commit fc68912 into compnerd:main Feb 19, 2025
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