Skip to content

Conversation

@bnbarham
Copy link
Contributor

The main snapshot was being used as we needed C++ interop changes. They're in the released 5.9.0 though, so update to a proper release instead.

@bnbarham
Copy link
Contributor Author

@swift-ci please test

Copy link
Member

Choose a reason for hiding this comment

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

hmm, that 0.0.0+Asserts might be load-bearing. I can't seem to find where DEVTOOLS_ROOT is specified in all of the XML, and I seem to have borked my Windows install so I can't just look at how it installs at the moment.

https://github.com/apple/swift-installer-scripts/blob/097a839f0d6d310e2618f3894e2666c8ba622a90/platforms/Windows/bld/bld.wxs#L307

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, the 0.0.0+Asserts is the development builds. 5.9 did not get the new layout changes, so this should be correct.

Copy link
Contributor Author

@bnbarham bnbarham Sep 28, 2023

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, the 0.0.0+Asserts is the development builds. 5.9 did not get the new layout changes, so this should be correct.

@etcwilde
Copy link
Member

Windows failure:

wix.exe : error WIX7013: Unable to open file: installer-amd64.exe. Error detail: Could not find file 'C:\Users\swift-ci\jenkins\workspace\swift-PR-windows\installer-amd64.exe'.

The main snapshot was being used as we needed C++ interop changes.
They're in the released 5.9.0 though, so update to a proper release
instead.
@bnbarham bnbarham force-pushed the use-5.9-toolchain-on-windows branch from 4f74c75 to 912e931 Compare September 28, 2023 19:52
@bnbarham
Copy link
Contributor Author

I have no idea how I managed that 🤔 Anyway, fixed.

@bnbarham
Copy link
Contributor Author

@swift-ci please test

@bnbarham
Copy link
Contributor Author

@swift-ci please test

@etcwilde
Copy link
Member

Linux test failure:

Failed Tests (1):
  swift-package-tests :: test-sourcekit-lsp/test-sourcekit-lsp.py

This should have been fixed last night.

@etcwilde
Copy link
Member

@swift-ci please test Linux

bnbarham pushed a commit to bnbarham/swift that referenced this pull request Sep 29, 2023
Fetch and extract a prebuilt toolchain to enable macros support on 5.10.
This is a squashed cherry-pick of swiftlang#68319, swiftlang#68411, swiftlang#68641, and swiftlang#68835.
@bnbarham bnbarham merged commit 4064d64 into swiftlang:main Sep 29, 2023
@bnbarham bnbarham deleted the use-5.9-toolchain-on-windows branch September 29, 2023 21:45
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.

3 participants