@@ -847,7 +847,7 @@ jobs:
847
847
- uses : actions/download-artifact@v4
848
848
with :
849
849
name : cmark-gfm-Windows-${{ matrix.arch }}-${{ inputs.swift_cmark_version }}
850
- path : ${{ github.workspace }}/BuildRoot /Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
850
+ path : ${{ github.workspace }}/BinaryCache /Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
851
851
852
852
- uses : actions/checkout@v4
853
853
with :
@@ -1008,7 +1008,7 @@ jobs:
1008
1008
-D SWIFT_PATH_TO_SWIFT_SDK="${SDKROOT}" `
1009
1009
-D CLANG_VENDOR=compnerd.org `
1010
1010
-D CLANG_VENDOR_UTI=org.compnerd.dt `
1011
- -D cmark-gfm_DIR=${{ github.workspace }}/BuildRoot /Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/lib/cmake `
1011
+ -D cmark-gfm_DIR=${{ github.workspace }}/BinaryCache /Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/lib/cmake `
1012
1012
-D PACKAGE_VENDOR=compnerd.org `
1013
1013
-D SWIFT_VENDOR=compnerd.org `
1014
1014
-D LLVM_PARALLEL_LINK_JOBS=2 `
@@ -1029,6 +1029,10 @@ jobs:
1029
1029
- name : Install Compiler Distribution
1030
1030
run : cmake --build ${{ github.workspace }}/BinaryCache/1 --target install-distribution-stripped
1031
1031
1032
+ - name : Copy cmark-gfm shared libraries
1033
+ run : |
1034
+ Copy-Item -Path "${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/bin/*.dll" -Destination "${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin"
1035
+
1032
1036
- name : Upload Compilers
1033
1037
uses : actions/upload-artifact@v4
1034
1038
with :
@@ -1540,14 +1544,6 @@ jobs:
1540
1544
with :
1541
1545
name : compilers-amd64
1542
1546
path : ${{ github.workspace }}/BuildRoot/Library
1543
- - uses : actions/download-artifact@v4
1544
- with :
1545
- name : cmark-gfm-Windows-amd64-${{ inputs.swift_cmark_version }}
1546
- path : ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
1547
-
1548
- - name : cmark-gfm Setup
1549
- run : Copy-Item ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/bin/*.dll ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/
1550
-
1551
1547
- uses : actions/checkout@v4
1552
1548
with :
1553
1549
repository : swiftlang/llvm-project
@@ -1756,14 +1752,6 @@ jobs:
1756
1752
with :
1757
1753
name : windows-vfs-overlay-${{ matrix.arch }}
1758
1754
path : ${{ github.workspace }}/BinaryCache/swift/stdlib
1759
- - uses : actions/download-artifact@v4
1760
- with :
1761
- name : cmark-gfm-Windows-amd64-${{ inputs.swift_cmark_version }}
1762
- path : ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
1763
-
1764
- - name : cmark-gfm Setup
1765
- run : Copy-Item ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/bin/*.dll ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/
1766
-
1767
1755
- uses : actions/checkout@v4
1768
1756
with :
1769
1757
repository : swiftlang/swift
@@ -2007,14 +1995,6 @@ jobs:
2007
1995
with :
2008
1996
name : macros-amd64
2009
1997
path : ${{ github.workspace }}/BinaryCache/Library
2010
- - uses : actions/download-artifact@v4
2011
- with :
2012
- name : cmark-gfm-Windows-amd64-${{ inputs.swift_cmark_version }}
2013
- path : ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
2014
-
2015
- - name : cmark-gfm Setup
2016
- run : Copy-Item ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/bin/*.dll ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/
2017
-
2018
1998
- uses : actions/checkout@v4
2019
1999
with :
2020
2000
repository : apple/swift-corelibs-libdispatch
@@ -2411,16 +2391,7 @@ jobs:
2411
2391
path : ${{ github.workspace }}/BinaryCache/swift-syntax
2412
2392
- uses : actions/download-artifact@v4
2413
2393
with :
2414
- name : cmark-gfm-Windows-amd64-${{ inputs.swift_cmark_version }}
2415
- path : ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
2416
-
2417
- - name : cmark-gfm Setup
2418
- run : Copy-Item ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/bin/*.dll ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/
2419
-
2420
- - uses : actions/download-artifact@v4
2421
- if : matrix.arch == 'arm64'
2422
- with :
2423
- name : cmark-gfm-Windows-arm64-${{ inputs.swift_cmark_version }}
2394
+ name : cmark-gfm-Windows-${{ matrix.arch }}-${{ inputs.swift_cmark_version }}
2424
2395
path : ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
2425
2396
2426
2397
- uses : actions/checkout@v4
@@ -3122,19 +3093,6 @@ jobs:
3122
3093
with :
3123
3094
name : Windows-sdk-${{ matrix.arch }}
3124
3095
path : ${{ github.workspace }}/BuildRoot/Library/Developer/Platforms/Windows.platform
3125
- - uses : actions/download-artifact@v4
3126
- with :
3127
- name : cmark-gfm-Windows-amd64-${{ inputs.swift_cmark_version }}
3128
- path : ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
3129
-
3130
- - name : cmark-gfm Setup
3131
- run : Copy-Item ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/bin/*.dll ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/
3132
-
3133
- - uses : actions/download-artifact@v4
3134
- if : matrix.arch == 'arm64'
3135
- with :
3136
- name : cmark-gfm-Windows-arm64-${{ inputs.swift_cmark_version }}
3137
- path : ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
3138
3096
3139
3097
- name : Update environment variables
3140
3098
run : |
@@ -3272,15 +3230,6 @@ jobs:
3272
3230
name : macros-${{ matrix.arch }}
3273
3231
path : ${{ github.workspace }}/BuildRoot/Library
3274
3232
3275
- - name : Download cmark-gfm
3276
- uses : actions/download-artifact@v4
3277
- with :
3278
- name : cmark-gfm-Windows-${{ matrix.arch }}-${{ inputs.swift_cmark_version }}
3279
- path : ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
3280
-
3281
- - name : cmark-gfm Setup
3282
- run : Copy-Item ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr/bin/*.dll ${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/
3283
-
3284
3233
- uses : actions/checkout@v4
3285
3234
with :
3286
3235
repository : swiftlang/swift-installer-scripts
0 commit comments