Skip to content

Commit a37030d

Browse files
committed
GHA: remove DEVTOOLS_ROOT property
Remove the use of the `DEVTOOLS_ROOT` property when building the installer MSIs. References to this have been removed from the WiX projects as of swiftlang/swift-installer-scripts#347.
1 parent d88686e commit a37030d

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3300,7 +3300,6 @@ jobs:
33003300
-p:SignOutput=${{ inputs.signed }} `
33013301
-p:CERTIFICATE=${env:CERTIFICATE} `
33023302
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
3303-
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
33043303
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
33053304
-p:ENABLE_MIMALLOC=${{ matrix.arch == 'amd64' && 'true' || 'false' }} `
33063305
-p:ProductArchitecture=${{ matrix.arch }} `
@@ -3315,7 +3314,6 @@ jobs:
33153314
-p:SignOutput=${{ inputs.signed }} `
33163315
-p:CERTIFICATE=${env:CERTIFICATE} `
33173316
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
3318-
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
33193317
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
33203318
-p:ProductArchitecture=${{ matrix.arch }} `
33213319
-p:ProductVersion=${{ inputs.swift_version }} `
@@ -3329,7 +3327,6 @@ jobs:
33293327
-p:SignOutput=${{ inputs.signed }} `
33303328
-p:CERTIFICATE=${env:CERTIFICATE} `
33313329
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
3332-
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
33333330
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
33343331
-p:INCLUDE_SWIFT_INSPECT=true `
33353332
-p:SWIFT_INSPECT_BUILD=${{ github.workspace }}/BuildRoot/DebuggingTools/swift-inspect `
@@ -3345,7 +3342,6 @@ jobs:
33453342
-p:SignOutput=${{ inputs.signed }} `
33463343
-p:CERTIFICATE=${env:CERTIFICATE} `
33473344
-p:PASSPHRASE=${{ secrets.PASSPHRASE }} `
3348-
-p:DEVTOOLS_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
33493345
-p:TOOLCHAIN_ROOT=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain `
33503346
-p:ProductArchitecture=${{ matrix.arch }} `
33513347
-p:ProductVersion=${{ inputs.swift_version }} `

0 commit comments

Comments
 (0)