Skip to content

Commit 3d105b3

Browse files
compnerdcompnerd
committed
GHA: update workflow for swiftlang/swift#75823
Update to use the new sqlite mirror for the swift toolchain. This ensures that we keep in sync with the official toolchain builds.
1 parent 73d1501 commit 3d105b3

File tree

2 files changed

+25
-48
lines changed

2 files changed

+25
-48
lines changed

‎.github/workflows/swift-toolchain.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ jobs:
114114
swift_revision: ${{ steps.context.outputs.swift_revision }}
115115
swift_syntax_revision: ${{ steps.context.outputs.swift_syntax_revision }}
116116
swift_system_revision: ${{ steps.context.outputs.swift_system_revision }}
117+
swift_toolchain_sqlite_revision: ${{ steps.context.outputs.swift_toolchain_sqlite_revision }}
117118
swift_tools_support_core_revision: ${{ steps.context.outputs.swift_tools_support_core_revision }}
118119
yams_revision: ${{ steps.context.outputs.yams_revision }}
119120
zlib_revision: ${{ steps.context.outputs.zlib_revision }}
@@ -179,6 +180,7 @@ jobs:
179180
swift_package_manager_revision=refs/tags/${{ inputs.swift_tag }}
180181
swift_syntax_revision=refs/tags/${{ inputs.swift_tag }}
181182
swift_system_revision=refs/tags/1.3.0
183+
swift_toolchain_sqlite_revision=refs/tags/main
182184
swift_tools_support_core_revision=refs/tags/${{ inputs.swift_tag }}
183185
curl_revision=refs/tags/curl-8_5_0
184186
libxml2_revision=refs/tags/v2.11.5
@@ -323,14 +325,12 @@ jobs:
323325
path: ${{ github.workspace }}/SourceCache/swift-build
324326
show-progress: false
325327

326-
- name: download sqlite
327-
run: |
328-
curl.exe -sL "https://sqlite.org/2023/sqlite-amalgamation-3430200.zip" -o $env:TEMP\sqlite-amalgamation-3430200.zip
329-
New-Item -ItemType Directory -Path ${{ github.workspace }}\SourceCache\sqlite-3.43.2
330-
unzip.exe -j -o $env:TEMP\sqlite-amalgamation-3430200.zip -d ${{ github.workspace }}\SourceCache\sqlite-3.43.2
331-
332-
- name: Copy CMakeLists.txt
333-
run: Copy-Item ${{ github.workspace }}\SourceCache\swift-build\cmake\SQLite\CMakeLists.txt -destination ${{ github.workspace }}\SourceCache\sqlite-3.43.2\CMakeLists.txt
328+
- uses: actions/checkout@v4
329+
with:
330+
repository: apple/swift-toolchain-sqlite
331+
ref: ${{ needs.context.outputs.swift_toolchain_sqlite_revision }}
332+
path: ${{ github.workspace }}/SourceCache/swift-toolchain-sqlite
333+
show-progress: false
334334

335335
- uses: compnerd/gha-setup-vsdevenv@main
336336
with:
@@ -353,7 +353,7 @@ jobs:
353353
- name: Configure SQLite
354354
run: |
355355
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
356-
cmake -B ${{ github.workspace }}/BinaryCache/sqlite-3.43.2 `
356+
cmake -B ${{ github.workspace }}/BinaryCache/sqlite-3.46.0 `
357357
-D BUILD_SHARED_LIBS=NO `
358358
-D CMAKE_BUILD_TYPE=Release `
359359
-D CMAKE_C_COMPILER=${{ matrix.cc }} `
@@ -363,21 +363,21 @@ jobs:
363363
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache `
364364
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
365365
-D CMAKE_MT=mt `
366-
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr `
366+
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr `
367367
-D CMAKE_SYSTEM_NAME=${{ matrix.os }} `
368368
-D CMAKE_ANDROID_NDK=$NDKPATH `
369369
${{ matrix.extra_flags }} `
370370
-G Ninja `
371-
-S ${{ github.workspace }}/SourceCache/sqlite-3.43.2
371+
-S ${{ github.workspace }}/SourceCache/swift-toolchain-sqlite
372372
- name: Build SQLite
373-
run: cmake --build ${{ github.workspace }}/BinaryCache/sqlite-3.43.2
373+
run: cmake --build ${{ github.workspace }}/BinaryCache/sqlite-3.46.0
374374
- name: Install SQLite
375-
run: cmake --build ${{ github.workspace }}/BinaryCache/sqlite-3.43.2 --target install
375+
run: cmake --build ${{ github.workspace }}/BinaryCache/sqlite-3.46.0 --target install
376376

377377
- uses: actions/upload-artifact@v4
378378
with:
379-
name: sqlite-${{ matrix.os }}-${{ matrix.arch }}-3.43.2
380-
path: ${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr
379+
name: sqlite-${{ matrix.os }}-${{ matrix.arch }}-3.46.0
380+
path: ${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr
381381

382382
# TODO(compnerd): remove this once android migrates to swift-foundation
383383
icu_tools:
@@ -2012,8 +2012,8 @@ jobs:
20122012
steps:
20132013
- uses: actions/download-artifact@v4
20142014
with:
2015-
name: sqlite-Windows-${{ matrix.arch }}-3.43.2
2016-
path: ${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr
2015+
name: sqlite-Windows-${{ matrix.arch }}-3.46.0
2016+
path: ${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr
20172017
- name: Download Compilers
20182018
uses: actions/download-artifact@v4
20192019
with:
@@ -2318,8 +2318,8 @@ jobs:
23182318
-G Ninja `
23192319
-S ${{ github.workspace }}/SourceCache/swift-llbuild `
23202320
-D LLBUILD_SUPPORT_BINDINGS=Swift `
2321-
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr/lib/SQLite3.lib `
2322-
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr/include
2321+
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/lib/SQLite3.lib `
2322+
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/include
23232323
- name: Build swift-llbuild
23242324
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-llbuild
23252325

@@ -2381,8 +2381,8 @@ jobs:
23812381
-G Ninja `
23822382
-S ${{ github.workspace }}/SourceCache/swift-tools-support-core `
23832383
-D SwiftSystem_DIR=${{ github.workspace }}/BinaryCache/swift-system/cmake/modules `
2384-
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr/lib/SQLite3.lib `
2385-
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr/include
2384+
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/lib/SQLite3.lib `
2385+
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/include
23862386
- name: Build swift-tools-support-core
23872387
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-tools-support-core
23882388

@@ -2416,8 +2416,8 @@ jobs:
24162416
-D ArgumentParser_DIR=${{ github.workspace }}/BinaryCache/swift-argument-parser/cmake/modules `
24172417
-D LLBuild_DIR=${{ github.workspace }}/BinaryCache/swift-llbuild/cmake/modules `
24182418
-D SwiftSystem_DIR=${{ github.workspace }}/BinaryCache/swift-system/cmake/modules `
2419-
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr/lib/SQLite3.lib `
2420-
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr/include `
2419+
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/lib/SQLite3.lib `
2420+
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/include `
24212421
-D TSC_DIR=${{ github.workspace }}/BinaryCache/swift-tools-support-core/cmake/modules `
24222422
-D Yams_DIR=${{ github.workspace }}/BinaryCache/yams/cmake/modules
24232423
- name: Build swift-driver
@@ -2502,8 +2502,8 @@ jobs:
25022502
-S ${{ github.workspace }}/SourceCache/swift-package-manager `
25032503
-D ArgumentParser_DIR=${{ github.workspace }}/BinaryCache/swift-argument-parser/cmake/modules `
25042504
-D LLBuild_DIR=${{ github.workspace }}/BinaryCache/swift-llbuild/cmake/modules `
2505-
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr/include `
2506-
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.43.2/usr/lib/SQLite3.lib `
2505+
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/include `
2506+
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/lib/SQLite3.lib `
25072507
-D SwiftASN1_DIR=${{ github.workspace }}/BinaryCache/swift-asn1/cmake/modules `
25082508
-D SwiftCertificates_DIR=${{ github.workspace }}/BinaryCache/swift-certificates/cmake/modules `
25092509
-D SwiftCollections_DIR=${{ github.workspace }}/BinaryCache/swift-collections/cmake/modules `

‎cmake/SQLite/CMakeLists.txt

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)