Skip to content

Commit 3cc1295

Browse files
authored
[Mac build] Update upload/download actions (#865)
This updates the upload and download actions to use the tar-artifact actions for the compilers and cmark-gfm artifacts, paving the way for the Mac compilers build.
1 parent 13ee36c commit 3cc1295

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

.github/workflows/swift-toolchain.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ jobs:
580580
run: cmake --build ${{ github.workspace }}/BinaryCache/cmark-gfm-${{ inputs.swift_cmark_version }}
581581
- name: Install cmark-gfm
582582
run: cmake --build ${{ github.workspace }}/BinaryCache/cmark-gfm-${{ inputs.swift_cmark_version }} --target install
583-
- uses: actions/upload-artifact@v4
583+
- uses: thebrowsercompany/gha-upload-tar-artifact@e18c33b1cd416d0d96a91dc6dce06219f98e4e27 # main
584584
with:
585585
name: cmark-gfm-${{ matrix.os }}-${{ matrix.arch }}-${{ inputs.swift_cmark_version }}
586586
path: ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
@@ -596,7 +596,7 @@ jobs:
596596
name: ${{ matrix.os }} ${{ matrix.arch }} Compiler Build Tools
597597

598598
steps:
599-
- uses: actions/download-artifact@v4
599+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
600600
with:
601601
name: cmark-gfm-${{ matrix.os }}-${{ matrix.arch }}-${{ inputs.swift_cmark_version }}
602602
path: ${{ github.workspace }}/BuildRoot/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
@@ -847,7 +847,7 @@ jobs:
847847
with:
848848
name: libxml2-Windows-${{ matrix.arch }}-${{ inputs.libxml2_version }}
849849
path: ${{ github.workspace }}/BinaryCache/Library/libxml2-${{ inputs.libxml2_version }}/usr
850-
- uses: actions/download-artifact@v4
850+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
851851
with:
852852
name: cmark-gfm-Windows-${{ matrix.arch }}-${{ inputs.swift_cmark_version }}
853853
path: ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
@@ -1053,9 +1053,9 @@ jobs:
10531053
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"
10541054
10551055
- name: Upload Compilers
1056-
uses: actions/upload-artifact@v4
1056+
uses: thebrowsercompany/gha-upload-tar-artifact@e18c33b1cd416d0d96a91dc6dce06219f98e4e27 # main
10571057
with:
1058-
name: compilers-${{ matrix.arch }}
1058+
name: compilers-Windows-${{ matrix.arch }}
10591059
path: ${{ github.workspace }}/BuildRoot/Library
10601060

10611061
- name: extract swift-syntax
@@ -1577,9 +1577,9 @@ jobs:
15771577

15781578
steps:
15791579
- name: Download Compilers
1580-
uses: actions/download-artifact@v4
1580+
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
15811581
with:
1582-
name: compilers-${{ inputs.build_arch }}
1582+
name: compilers-Windows-${{ inputs.build_arch }}
15831583
path: ${{ github.workspace }}/BuildRoot/Library
15841584
- uses: actions/checkout@v4
15851585
with:
@@ -1793,9 +1793,9 @@ jobs:
17931793

17941794
steps:
17951795
- name: Download Compilers
1796-
uses: actions/download-artifact@v4
1796+
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
17971797
with:
1798-
name: compilers-${{ inputs.build_arch }}
1798+
name: compilers-Windows-${{ inputs.build_arch }}
17991799
path: ${{ github.workspace }}/BinaryCache/Library
18001800
- name: Download swift-syntax
18011801
uses: actions/download-artifact@v4
@@ -2040,9 +2040,9 @@ jobs:
20402040
path: ${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr
20412041

20422042
- name: Download Compilers
2043-
uses: actions/download-artifact@v4
2043+
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
20442044
with:
2045-
name: compilers-${{ inputs.build_arch }}
2045+
name: compilers-Windows-${{ inputs.build_arch }}
20462046
path: ${{ github.workspace }}/BinaryCache/Library
20472047
- uses: actions/download-artifact@v4
20482048
if: matrix.os != 'Android' || inputs.build_android
@@ -2457,9 +2457,9 @@ jobs:
24572457
path: ${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr
24582458

24592459
- name: Download Compilers
2460-
uses: actions/download-artifact@v4
2460+
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
24612461
with:
2462-
name: compilers-${{ inputs.build_arch }}
2462+
name: compilers-Windows-${{ inputs.build_arch }}
24632463
path: ${{ github.workspace }}/BinaryCache/Library
24642464
- uses: actions/download-artifact@v4
24652465
with:
@@ -2477,7 +2477,7 @@ jobs:
24772477
with:
24782478
name: swift-syntax-${{ matrix.arch }}
24792479
path: ${{ github.workspace }}/BinaryCache/swift-syntax
2480-
- uses: actions/download-artifact@v4
2480+
- uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
24812481
with:
24822482
name: cmark-gfm-Windows-${{ matrix.arch }}-${{ inputs.swift_cmark_version }}
24832483
path: ${{ github.workspace }}/BinaryCache/Library/cmark-gfm-${{ inputs.swift_cmark_version }}/usr
@@ -3168,9 +3168,9 @@ jobs:
31683168
path: ${{ github.workspace }}/BinaryCache/swift-argument-parser
31693169

31703170
- name: Download Compilers
3171-
uses: actions/download-artifact@v4
3171+
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
31723172
with:
3173-
name: compilers-${{ inputs.build_arch }}
3173+
name: compilers-Windows-${{ inputs.build_arch }}
31743174
path: ${{ github.workspace }}/BinaryCache/Library
31753175
- name: Download stdlib
31763176
uses: actions/download-artifact@v4
@@ -3279,9 +3279,9 @@ jobs:
32793279
path: ${{ github.workspace }}/BuildRoot/Library
32803280

32813281
- name: Download Compilers
3282-
uses: actions/download-artifact@v4
3282+
uses: thebrowsercompany/gha-download-tar-artifact@59992d91335d4ecba543c8535f7d07238e42125d # main
32833283
with:
3284-
name: compilers-${{ matrix.arch }}
3284+
name: compilers-Windows-${{ matrix.arch }}
32853285
path: ${{ github.workspace }}/BuildRoot/Library
32863286

32873287
- name: Download Developer Tools

0 commit comments

Comments
 (0)