Skip to content

Commit 3f5869a

Browse files
authored
Copy cmark-gfm libraries in the compilers job (#838)
Previously, the cmark-gfm libraries would be copied to the compilers binary directory in every job using the compilers. Since this is needed to run the compilers, this moves the cmark-gfm copy library step to be done once in the compilers job.
1 parent abcedc8 commit 3f5869a

File tree

1 file changed

+7
-58
lines changed

1 file changed

+7
-58
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 7 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ jobs:
847847
- uses: actions/download-artifact@v4
848848
with:
849849
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
851851

852852
- uses: actions/checkout@v4
853853
with:
@@ -1008,7 +1008,7 @@ jobs:
10081008
-D SWIFT_PATH_TO_SWIFT_SDK="${SDKROOT}" `
10091009
-D CLANG_VENDOR=compnerd.org `
10101010
-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 `
10121012
-D PACKAGE_VENDOR=compnerd.org `
10131013
-D SWIFT_VENDOR=compnerd.org `
10141014
-D LLVM_PARALLEL_LINK_JOBS=2 `
@@ -1029,6 +1029,10 @@ jobs:
10291029
- name: Install Compiler Distribution
10301030
run: cmake --build ${{ github.workspace }}/BinaryCache/1 --target install-distribution-stripped
10311031

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+
10321036
- name: Upload Compilers
10331037
uses: actions/upload-artifact@v4
10341038
with:
@@ -1540,14 +1544,6 @@ jobs:
15401544
with:
15411545
name: compilers-amd64
15421546
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-
15511547
- uses: actions/checkout@v4
15521548
with:
15531549
repository: swiftlang/llvm-project
@@ -1756,14 +1752,6 @@ jobs:
17561752
with:
17571753
name: windows-vfs-overlay-${{ matrix.arch }}
17581754
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-
17671755
- uses: actions/checkout@v4
17681756
with:
17691757
repository: swiftlang/swift
@@ -2007,14 +1995,6 @@ jobs:
20071995
with:
20081996
name: macros-amd64
20091997
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-
20181998
- uses: actions/checkout@v4
20191999
with:
20202000
repository: apple/swift-corelibs-libdispatch
@@ -2411,16 +2391,7 @@ jobs:
24112391
path: ${{ github.workspace }}/BinaryCache/swift-syntax
24122392
- uses: actions/download-artifact@v4
24132393
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 }}
24242395
path: ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
24252396

24262397
- uses: actions/checkout@v4
@@ -3122,19 +3093,6 @@ jobs:
31223093
with:
31233094
name: Windows-sdk-${{ matrix.arch }}
31243095
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
31383096

31393097
- name: Update environment variables
31403098
run: |
@@ -3272,15 +3230,6 @@ jobs:
32723230
name: macros-${{ matrix.arch }}
32733231
path: ${{ github.workspace }}/BuildRoot/Library
32743232

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-
32843233
- uses: actions/checkout@v4
32853234
with:
32863235
repository: swiftlang/swift-installer-scripts

0 commit comments

Comments
 (0)