Skip to content

Commit 1177dfa

Browse files
Steelskincompnerd
Steelskin
authored and
compnerd
committed
[sqlite] Remove Android builds
These are not consumed by any other step.
1 parent 1093ac8 commit 1177dfa

File tree

1 file changed

+18
-66
lines changed

1 file changed

+18
-66
lines changed

‎.github/workflows/swift-toolchain.yml

Lines changed: 18 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ jobs:
114114
swift_syntax_revision: ${{ steps.context.outputs.swift_syntax_revision }}
115115
swift_system_revision: ${{ steps.context.outputs.swift_system_revision }}
116116
swift_toolchain_sqlite_revision: ${{ steps.context.outputs.swift_toolchain_sqlite_revision }}
117+
swift_toolchain_sqlite_version: ${{ steps.context.outputs.swift_toolchain_sqlite_version }}
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 }}
@@ -180,6 +181,7 @@ jobs:
180181
swift_syntax_revision=refs/tags/${{ inputs.swift_tag }}
181182
swift_system_revision=refs/tags/1.3.0
182183
swift_toolchain_sqlite_revision=refs/tags/main
184+
swift_toolchain_sqlite_version=3.46.0
183185
swift_tools_support_core_revision=refs/tags/${{ inputs.swift_tag }}
184186
curl_revision=refs/tags/curl-8_5_0
185187
libxml2_revision=refs/tags/v2.11.5
@@ -265,55 +267,13 @@ jobs:
265267
cxx: cl
266268
cxxflags: ${{ needs.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}
267269
os: Windows
268-
extra_flags:
269270

270271
- arch: arm64
271272
cc: cl
272273
cflags: ${{ needs.context.outputs.WINDOWS_CMAKE_C_FLAGS }}
273274
cxx: cl
274275
cxxflags: ${{ needs.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}
275276
os: Windows
276-
extra_flags:
277-
278-
- arch: x86
279-
cc: cl
280-
cflags: ${{ needs.context.outputs.WINDOWS_CMAKE_C_FLAGS }}
281-
cxx: cl
282-
cxxflags: ${{ needs.context.outputs.WINDOWS_CMAKE_CXX_FLAGS }}
283-
os: Windows
284-
extra_flags:
285-
286-
- arch: arm64
287-
cc: clang
288-
cflags: ${{ needs.context.outputs.ANDROID_CMAKE_C_FLAGS }}
289-
cxx: clang++
290-
cxxflags: ${{ needs.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}
291-
os: Android
292-
extra_flags: -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a
293-
294-
- arch: armv7
295-
cc: clang
296-
cflags: ${{ needs.context.outputs.ANDROID_CMAKE_C_FLAGS }}
297-
cxx: clang++
298-
cxxflags: ${{ needs.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}
299-
os: Android
300-
extra_flags: -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=armeabi-v7a
301-
302-
- arch: i686
303-
cc: clang
304-
cflags: ${{ needs.context.outputs.ANDROID_CMAKE_C_FLAGS }}
305-
cxx: clang++
306-
cxxflags: ${{ needs.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}
307-
os: Android
308-
extra_flags: -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=x86
309-
310-
- arch: x86_64
311-
cc: clang
312-
cflags: ${{ needs.context.outputs.ANDROID_CMAKE_C_FLAGS }}
313-
cxx: clang++
314-
cxxflags: ${{ needs.context.outputs.ANDROID_CMAKE_CXX_FLAGS }}
315-
os: Android
316-
extra_flags: -DCMAKE_ANDROID_API=${{ needs.context.outputs.ANDROID_API_LEVEL }} -DCMAKE_ANDROID_ARCH_ABI=x86_64
317277

318278
name: ${{ matrix.os }} ${{ matrix.arch }} SQLite3
319279

@@ -343,15 +303,9 @@ jobs:
343303
key: ${{ matrix.os }}-${{ matrix.arch }}-sqlite
344304
variant: sccache
345305

346-
- uses: nttld/setup-ndk@v1
347-
id: setup-ndk
348-
with:
349-
ndk-version: r26b
350-
351306
- name: Configure SQLite
352307
run: |
353-
$NDKPATH = cygpath -m ${{ steps.setup-ndk.outputs.ndk-path }}
354-
cmake -B ${{ github.workspace }}/BinaryCache/sqlite-3.46.0 `
308+
cmake -B ${{ github.workspace }}/BinaryCache/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }} `
355309
-D BUILD_SHARED_LIBS=NO `
356310
-D CMAKE_BUILD_TYPE=Release `
357311
-D CMAKE_C_COMPILER=${{ matrix.cc }} `
@@ -361,21 +315,19 @@ jobs:
361315
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache `
362316
-D CMAKE_CXX_FLAGS="${{ matrix.cxxflags }}" `
363317
-D CMAKE_MT=mt `
364-
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr `
318+
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr `
365319
-D CMAKE_SYSTEM_NAME=${{ matrix.os }} `
366-
-D CMAKE_ANDROID_NDK=$NDKPATH `
367-
${{ matrix.extra_flags }} `
368320
-G Ninja `
369321
-S ${{ github.workspace }}/SourceCache/swift-toolchain-sqlite
370322
- name: Build SQLite
371-
run: cmake --build ${{ github.workspace }}/BinaryCache/sqlite-3.46.0
323+
run: cmake --build ${{ github.workspace }}/BinaryCache/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}
372324
- name: Install SQLite
373-
run: cmake --build ${{ github.workspace }}/BinaryCache/sqlite-3.46.0 --target install
325+
run: cmake --build ${{ github.workspace }}/BinaryCache/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }} --target install
374326

375327
- uses: actions/upload-artifact@v4
376328
with:
377-
name: sqlite-${{ matrix.os }}-${{ matrix.arch }}-3.46.0
378-
path: ${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr
329+
name: sqlite-${{ matrix.os }}-${{ matrix.arch }}-${{ needs.context.outputs.swift_toolchain_sqlite_version }}
330+
path: ${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr
379331

380332
cmark_gfm:
381333
needs: [context]
@@ -1984,8 +1936,8 @@ jobs:
19841936
steps:
19851937
- uses: actions/download-artifact@v4
19861938
with:
1987-
name: sqlite-Windows-${{ matrix.arch }}-3.46.0
1988-
path: ${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr
1939+
name: sqlite-Windows-${{ matrix.arch }}-${{ needs.context.outputs.swift_toolchain_sqlite_version }}
1940+
path: ${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr
19891941
- name: Download Compilers
19901942
uses: actions/download-artifact@v4
19911943
with:
@@ -2290,8 +2242,8 @@ jobs:
22902242
-G Ninja `
22912243
-S ${{ github.workspace }}/SourceCache/swift-llbuild `
22922244
-D LLBUILD_SUPPORT_BINDINGS=Swift `
2293-
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/lib/SQLite3.lib `
2294-
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/include
2245+
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr/lib/SQLite3.lib `
2246+
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr/include
22952247
- name: Build swift-llbuild
22962248
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-llbuild
22972249

@@ -2353,8 +2305,8 @@ jobs:
23532305
-G Ninja `
23542306
-S ${{ github.workspace }}/SourceCache/swift-tools-support-core `
23552307
-D SwiftSystem_DIR=${{ github.workspace }}/BinaryCache/swift-system/cmake/modules `
2356-
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/lib/SQLite3.lib `
2357-
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/include
2308+
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr/lib/SQLite3.lib `
2309+
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr/include
23582310
- name: Build swift-tools-support-core
23592311
run: cmake --build ${{ github.workspace }}/BinaryCache/swift-tools-support-core
23602312

@@ -2388,8 +2340,8 @@ jobs:
23882340
-D ArgumentParser_DIR=${{ github.workspace }}/BinaryCache/swift-argument-parser/cmake/modules `
23892341
-D LLBuild_DIR=${{ github.workspace }}/BinaryCache/swift-llbuild/cmake/modules `
23902342
-D SwiftSystem_DIR=${{ github.workspace }}/BinaryCache/swift-system/cmake/modules `
2391-
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/lib/SQLite3.lib `
2392-
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/include `
2343+
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr/lib/SQLite3.lib `
2344+
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr/include `
23932345
-D TSC_DIR=${{ github.workspace }}/BinaryCache/swift-tools-support-core/cmake/modules `
23942346
-D Yams_DIR=${{ github.workspace }}/BinaryCache/yams/cmake/modules
23952347
- name: Build swift-driver
@@ -2474,8 +2426,8 @@ jobs:
24742426
-S ${{ github.workspace }}/SourceCache/swift-package-manager `
24752427
-D ArgumentParser_DIR=${{ github.workspace }}/BinaryCache/swift-argument-parser/cmake/modules `
24762428
-D LLBuild_DIR=${{ github.workspace }}/BinaryCache/swift-llbuild/cmake/modules `
2477-
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/include `
2478-
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-3.46.0/usr/lib/SQLite3.lib `
2429+
-D SQLite3_INCLUDE_DIR=${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr/include `
2430+
-D SQLite3_LIBRARY=${{ github.workspace }}/BuildRoot/Library/sqlite-${{ needs.context.outputs.swift_toolchain_sqlite_version }}/usr/lib/SQLite3.lib `
24792431
-D SwiftASN1_DIR=${{ github.workspace }}/BinaryCache/swift-asn1/cmake/modules `
24802432
-D SwiftCertificates_DIR=${{ github.workspace }}/BinaryCache/swift-certificates/cmake/modules `
24812433
-D SwiftCollections_DIR=${{ github.workspace }}/BinaryCache/swift-collections/cmake/modules `

0 commit comments

Comments
 (0)