search

swiftlang / swift-installer-scripts

Apache License 2.0
72 stars 38 forks source link

Per user bundle and side-by-side upgrade support #224

Closed barnson closed 1 year ago

barnson commented 1 year ago

They show up for me? https://github.com/apple/swift-installer-scripts/pull/224/files#diff-2855a8e408181c8244cf51860abeee775421556171314fa3ddcc04a19b8bc3d8

compnerd commented 1 year ago

They show up for me? https://github.com/apple/swift-installer-scripts/pull/224/files#diff-2855a8e408181c8244cf51860abeee775421556171314fa3ddcc04a19b8bc3d8

I blame lack of coffee. I swear they weren't showing up earlier.

compnerd commented 1 year ago

Hmm, seems that something is wrong:

C:\Users\swift-ci\jenkins\workspace\swift-PR-build-toolchain-windows\swift-installer-scripts\platforms\Windows\cli\cli.wxs(34): error WIX0103: Cannot find the File file '\usr\bin\clang-tidy.exe'. The following paths were checked: \usr\bin\clang-tidy.exe [C:\Users\swift-ci\jenkins\workspace\swift-PR-build-toolchain-windows\swift-installer-scripts\platforms\Windows\cli\cli.wixproj]

Seems that we are stripping the location prefix when building the installer?

compnerd commented 1 year ago

Oh, it re-builds the MSIs?

barnson commented 1 year ago

It should be passing the same MSBuild properties to the project references, so TOOLCHAIN_ROOT gets passed in from the original MSBuild invocation and flows down into the .wixprojs to get set as a preprocessor variable. Is it possible to get MSBuild binlogs as an artifact?

barnson commented 1 year ago

Can you point to the CI run?

compnerd commented 1 year ago

https://ci-external.swift.org/job/swift-PR-build-toolchain-windows/750/consoleText

barnson commented 1 year ago

build-windows-toolchain.bat needs some changes: https://github.com/barnson/swift/commit/2f81b90c0de2c7fb88fcec954b4a6a31dfb8550f. I can send that as a PR if that's easier.

tristanlabelle commented 1 year ago

@barnson That'd be useful!

compnerd commented 1 year ago

I already have https://github.com/apple/swift/pull/67961 up, I can likely just roll it into it

compnerd commented 1 year ago

https://ci-external.swift.org/job/swift-PR-build-toolchain-windows/752/

barnson commented 1 year ago

I'm not sure what the syntax is but move a b c dir doesn't seem to work.

compnerd commented 1 year ago

Awesome: https://ci-external.swift.org/job/swift-PR-build-toolchain-windows/761/console ... seems that we can build that. Need to tweak the CI rules before we could merge this.

compnerd commented 1 year ago

Running https://ci-external.swift.org/job/swift-PR-build-toolchain-windows/762/ with a workaround to see if we can get this through.