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 the 5.10 release branch #693

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Conversation

hyp
Copy link
Collaborator

@hyp hyp commented Dec 15, 2023

No description provided.

@hyp hyp requested a review from compnerd December 15, 2023 00:22
@compnerd
Copy link
Owner

I don't understand the revert. That effectively disables macros doesn't it?

@hyp
Copy link
Collaborator Author

hyp commented Dec 15, 2023

I don't understand the revert. That effectively disables macros doesn't it?

This caused the following failure, so I disabled this specific change:

Run $module = "C:\a\swift-build\swift-build/BinaryCache/1/cmake/modules/SwiftSyntaxConfig.cmake"
Get-Content: C:\a\_temp\4742a4db-1ae7-4860-91b8-d9d7235cc3c4.ps1:4
Line |
   4 |  (Get-Content $module).Replace("${bindir}", '<BINARY_DIR>') | Set-Cont …
     |   ~~~~~~~~~~~~~~~~~~~
     | Cannot find path 'C:\a\swift-build\swift-build\BinaryCache\1\cmake\modules\SwiftSyntaxConfig.cmake' because it
     | does not exist.

Should I bring back that commit?

@compnerd
Copy link
Owner

Hmm, I believe that change should be in the 5.10 release, so this seems like something to investigate (or we might have regressed on 5.10 with the macros support 🤦‍♂️).

@hyp
Copy link
Collaborator Author

hyp commented Dec 15, 2023

Hmm, I believe that change should be in the 5.10 release, so this seems like something to investigate (or we might have regressed on 5.10 with the macros support 🤦‍♂️).

cool, let me see if I can dig into it more.

@hyp
Copy link
Collaborator Author

hyp commented Dec 15, 2023

@compnerd it's ready now, but I need to merge swiftlang/swift#70500 first

@hyp hyp force-pushed the eng/5.10/update branch 2 times, most recently from cf63afe to 68a3469 Compare December 18, 2023 16:37
@hyp
Copy link
Collaborator Author

hyp commented Dec 20, 2023

@compnerd looks like this branch is protected and even a rebased merge isn't working here

@hyp hyp merged commit 632e935 into compnerd:release/5.10 Dec 20, 2023
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