Skip to content

Commit 28fcc1d

Browse files
compnerdcompnerd
committed
GHA: remove Yams from the build
This is no longer used as a dependency for swift-driver, remove the unnecessary build.
1 parent 1cb3416 commit 28fcc1d

File tree

2 files changed

+2
-52
lines changed

2 files changed

+2
-52
lines changed

Diff for: ‎.github/workflows/build-toolchain.yml

-4
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ jobs:
172172
swift_toolchain_sqlite_revision: ${{ steps.context.outputs.swift_toolchain_sqlite_revision }}
173173
swift_toolchain_sqlite_version: ${{ steps.context.outputs.swift_toolchain_sqlite_version }}
174174
swift_tools_support_core_revision: ${{ steps.context.outputs.swift_tools_support_core_revision }}
175-
yams_revision: ${{ steps.context.outputs.yams_revision }}
176175
zlib_revision: ${{ steps.context.outputs.zlib_revision }}
177176
zlib_version: ${{ steps.context.outputs.zlib_version }}
178177
ANDROID_API_LEVEL: ${{ steps.context.outputs.ANDROID_API_LEVEL }}
@@ -265,7 +264,6 @@ jobs:
265264
curl_revision=refs/tags/curl-8_5_0
266265
ds2_revision=refs/tags/nightly-2024-11-07
267266
libxml2_revision=refs/tags/v2.11.5
268-
yams_revision=refs/tags/5.0.6
269267
zlib_revision=refs/tags/v1.3.1
270268
EOF
271269
else
@@ -690,7 +688,6 @@ jobs:
690688
swift_toolchain_sqlite_revision: ${{ needs.context.outputs.swift_toolchain_sqlite_revision }}
691689
swift_toolchain_sqlite_version: ${{ needs.context.outputs.swift_toolchain_sqlite_version }}
692690
swift_tools_support_core_revision: ${{ needs.context.outputs.swift_tools_support_core_revision }}
693-
yams_revision: ${{ needs.context.outputs.yams_revision }}
694691
zlib_revision: ${{ needs.context.outputs.zlib_revision }}
695692
zlib_version: ${{ needs.context.outputs.zlib_version }}
696693
ANDROID_API_LEVEL: ${{ needs.context.outputs.ANDROID_API_LEVEL }}
@@ -765,7 +762,6 @@ jobs:
765762
swift_toolchain_sqlite_revision: ${{ needs.context.outputs.swift_toolchain_sqlite_revision }}
766763
swift_toolchain_sqlite_version: ${{ needs.context.outputs.swift_toolchain_sqlite_version }}
767764
swift_tools_support_core_revision: ${{ needs.context.outputs.swift_tools_support_core_revision }}
768-
yams_revision: ${{ needs.context.outputs.yams_revision }}
769765
zlib_revision: ${{ needs.context.outputs.zlib_revision }}
770766
zlib_version: ${{ needs.context.outputs.zlib_version }}
771767
ANDROID_API_LEVEL: ${{ needs.context.outputs.ANDROID_API_LEVEL }}

Diff for: ‎.github/workflows/swift-toolchain.yml

+2-48
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,6 @@ on:
171171
required: true
172172
type: string
173173

174-
yams_revision:
175-
required: true
176-
type: string
177-
178174
zlib_revision:
179175
required: true
180176
type: string
@@ -767,12 +763,6 @@ jobs:
767763
ref: ${{ inputs.swift_argument_parser_revision }}
768764
path: ${{ github.workspace }}/SourceCache/swift-argument-parser
769765
show-progress: false
770-
- uses: actions/checkout@v4
771-
with:
772-
repository: jpsim/Yams
773-
ref: ${{ inputs.yams_revision }}
774-
path: ${{ github.workspace }}/SourceCache/Yams
775-
show-progress: false
776766
- uses: actions/checkout@v4
777767
with:
778768
repository: swiftlang/swift-driver
@@ -2664,12 +2654,6 @@ jobs:
26642654
ref: ${{ inputs.swift_tools_support_core_revision }}
26652655
path: ${{ github.workspace }}/SourceCache/swift-tools-support-core
26662656
show-progress: false
2667-
- uses: actions/checkout@v4
2668-
with:
2669-
repository: jpsim/Yams
2670-
ref: ${{ inputs.yams_revision }}
2671-
path: ${{ github.workspace }}/SourceCache/Yams
2672-
show-progress: false
26732657
- uses: actions/checkout@v4
26742658
with:
26752659
repository: swiftlang/swift
@@ -2803,34 +2787,6 @@ jobs:
28032787
- name: Build swift-crypto
28042788
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-crypto
28052789

2806-
- name: Configure Yams
2807-
run: |
2808-
# Workaround CMake 3.20 issue
2809-
$SWIFTC = cygpath -m ${{ github.workspace }}/BinaryCache/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe
2810-
2811-
cmake -B ${{ github.workspace }}/BinaryCache/yams `
2812-
-D BUILD_SHARED_LIBS=NO `
2813-
-D BUILD_TESTING=NO `
2814-
-D CMAKE_BUILD_TYPE=Release `
2815-
-D CMAKE_C_COMPILER=cl `
2816-
-D CMAKE_C_COMPILER_TARGET=${{ matrix.triple }} `
2817-
-D CMAKE_C_FLAGS="${{ inputs.WINDOWS_CMAKE_C_FLAGS }}" `
2818-
-D CMAKE_CXX_COMPILER=cl `
2819-
-D CMAKE_CXX_COMPILER_TARGET=${{ matrix.triple }} `
2820-
-D CMAKE_CXX_FLAGS="${{ inputs.WINDOWS_CMAKE_CXX_FLAGS }}" `
2821-
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr `
2822-
-D CMAKE_Swift_COMPILER=${SWIFTC} `
2823-
-D CMAKE_Swift_COMPILER_TARGET=${{ matrix.triple }} `
2824-
-D CMAKE_Swift_COMPILER_WORKS=YES `
2825-
-D CMAKE_Swift_FLAGS="-sdk ${env:SDKROOT} ${{ inputs.CMAKE_Swift_FLAGS }}" `
2826-
-D CMAKE_Swift_FLAGS_RELEASE="-O" `
2827-
-D CMAKE_SYSTEM_NAME=Windows `
2828-
-D CMAKE_SYSTEM_PROCESSOR=${{ matrix.cpu }} `
2829-
-G Ninja `
2830-
-S ${{ github.workspace }}/SourceCache/Yams
2831-
- name: Build Yams
2832-
run: cmake --build ${{ github.workspace }}/BinaryCache/yams
2833-
28342790
- name: Configure swift-llbuild
28352791
run: |
28362792
# Workaround CMake 3.20 issue
@@ -2954,8 +2910,7 @@ jobs:
29542910
-D SwiftSystem_DIR=${{ github.workspace }}/BinaryCache/swift-system/cmake/modules `
29552911
-D SQLite3_LIBRARY=${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/lib/SQLite3.lib `
29562912
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BinaryCache/Library/sqlite-${{ inputs.swift_toolchain_sqlite_version }}/usr/include `
2957-
-D TSC_DIR=${{ github.workspace }}/BinaryCache/swift-tools-support-core/cmake/modules `
2958-
-D Yams_DIR=${{ github.workspace }}/BinaryCache/yams/cmake/modules
2913+
-D TSC_DIR=${{ github.workspace }}/BinaryCache/swift-tools-support-core/cmake/modules
29592914
- name: Build swift-driver
29602915
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-driver
29612916

@@ -3046,8 +3001,7 @@ jobs:
30463001
-D SwiftDriver_DIR=${{ github.workspace }}/BinaryCache/swift-driver/cmake/modules `
30473002
-D SwiftSyntax_DIR=${{ github.workspace }}/BinaryCache/swift-syntax/cmake/modules `
30483003
-D SwiftSystem_DIR=${{ github.workspace }}/BinaryCache/swift-system/cmake/modules `
3049-
-D TSC_DIR=${{ github.workspace }}/BinaryCache/swift-tools-support-core/cmake/modules `
3050-
-D Yams_DIR=${{ github.workspace }}/BinaryCache/yams/cmake/modules
3004+
-D TSC_DIR=${{ github.workspace }}/BinaryCache/swift-tools-support-core/cmake/modules
30513005
- name: Build swift-package-manager
30523006
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-package-manager
30533007

0 commit comments

Comments
 (0)