Skip to content

Commit a1a32e9

Browse files
committed
Properly extract swift-syntax on mac
1 parent bc764e1 commit a1a32e9

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,22 +1085,23 @@ jobs:
10851085
name: compilers-${{ matrix.os }}-${{ matrix.arch }}
10861086
path: ${{ github.workspace }}/BuildRoot/Library
10871087

1088-
- name: extract swift-syntax
1088+
- name: Extract swift-syntax
10891089
run: |
1090-
$bindir = "${{ github.workspace }}/BinaryCache/1"
1090+
New-Item -Path ${{ github.workspace }}/BinaryCache/swift-syntax/lib/swift/host -ItemType Directory | Out-Null
10911091
if ("${{ matrix.os }}" -eq "Windows") {
1092-
$libSuffix = ".lib"
1093-
$bindir = cygpath -m "${bindir}"
1092+
$bindir = cygpath -m "${{ github.workspace }}/BinaryCache/1"
1093+
Copy-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/lib/*.lib" -Destination "${{ github.workspace }}/BinaryCache/swift-syntax/lib"
1094+
Copy-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/lib/*.lib" -Destination "${{ github.workspace }}/BinaryCache/swift-syntax/lib/swift/host"
1095+
Copy-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/lib/swift/host/*.swiftmodule" -Destination "${{ github.workspace }}/BinaryCache/swift-syntax/lib/swift/host" -Recurse
10941096
} else {
1095-
$libSuffix = ".dylib"
1097+
$bindir = "${{ github.workspace }}/BinaryCache/1"
1098+
Copy-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/lib/*.dylib" -Destination "${{ github.workspace }}/BinaryCache/swift-syntax/lib"
1099+
Copy-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/lib/swift/host/*.dylib" -Destination "${{ github.workspace }}/BinaryCache/swift-syntax/lib/swift/host"
1100+
Copy-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/lib/swift/host/*.swiftmodule" -Destination "${{ github.workspace }}/BinaryCache/swift-syntax/lib/swift/host" -Recurse
10961101
}
10971102
10981103
$module = "${{ github.workspace }}/BinaryCache/1/cmake/modules/SwiftSyntaxConfig.cmake"
10991104
(Get-Content $module).Replace("${bindir}", '<BINARY_DIR>') | Set-Content $module
1100-
New-Item -Path ${{ github.workspace }}/BinaryCache/swift-syntax/lib/swift/host -ItemType Directory | Out-Null
1101-
Copy-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/lib/*${libSuffix}" -Destination "${{ github.workspace }}/BinaryCache/swift-syntax/lib"
1102-
Copy-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/lib/*${libSuffix}" -Destination "${{ github.workspace }}/BinaryCache/swift-syntax/lib/swift/host"
1103-
Copy-Item -Path "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/lib/swift/host/*.swiftmodule" -Destination "${{ github.workspace }}/BinaryCache/swift-syntax/lib/swift/host" -Recurse
11041105
New-Item -Path ${{ github.workspace }}/BinaryCache/swift-syntax/cmake/modules -ItemType Directory | Out-Null
11051106
Copy-Item -Path $module -Destination "${{ github.workspace }}/BinaryCache/swift-syntax/cmake/modules"
11061107

0 commit comments

Comments
 (0)