Skip to content

Commit 9a98ea2

Browse files
committed
Check what's going wrong on macOS CI in some cases
1 parent 7257271 commit 9a98ea2

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

.github/workflows/sdks.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,7 @@ jobs:
240240
"extra-cpp-flags": [ "-lstdc++" ],
241241
"extra-swiftc-flags": [
242242
"-resource-dir", "${SDK_PATH}/usr/lib/swift",
243-
"-tools-directory", "${NDK_PREBUILT}/bin",
244-
"-L", "${SDK_PATH}/usr/lib"
243+
"-tools-directory", "${NDK_PREBUILT}/bin"
245244
]
246245
}
247246
EOF
@@ -261,10 +260,10 @@ jobs:
261260
repository: apple/swift-argument-parser
262261
path: swift-argument-parser
263262
- name: Build Swift Argument Parser package
264-
# macOS error: ld.lld: error: --defsym:1: symbol not found: changelog_authors_main
265-
if: ${{ startsWith(matrix.os, 'ubuntu') }}
266263
run: |
267264
cd swift-argument-parser
265+
# perl -pi -e 's%macOS%Windows%' Package.swift
266+
rm Examples/count-lines/CountLines.swift Tools/changelog-authors/*.swift
268267
${TOOLCHAIN}/bin/swift build --build-tests --destination ${ARCH_JSON} -Xlinker -rpath -Xlinker \$ORIGIN/lib/swift/android
269268
- name: Get Swift crypto package
270269
uses: actions/checkout@v4
@@ -413,9 +412,8 @@ jobs:
413412
mkdir -p pack/lib/swift/android
414413
TARGET="x86_64-unknown-linux-android$ANDROID_API_LEVEL"
415414
416-
if ${{ startsWith(matrix.os, 'ubuntu') }}; then
417-
cp swift-argument-parser/.build/$TARGET/debug/{generate-manual,math,repeat,roll,swift-argument-parserPackageTests.xctest} pack
418-
echo 'adb shell /data/local/tmp/pack/swift-argument-parserPackageTests.xctest' >> ~/test-toolchain.sh
415+
cp swift-argument-parser/.build/$TARGET/debug/{generate-manual,math,repeat,roll,swift-argument-parserPackageTests.xctest} pack
416+
echo 'adb shell /data/local/tmp/pack/swift-argument-parserPackageTests.xctest' >> ~/test-toolchain.sh
419417
420418
wget -q https://raw.githubusercontent.com/termux/termux-elf-cleaner/v2.1.1/elf-cleaner.cpp
421419
wget -q https://raw.githubusercontent.com/termux/termux-elf-cleaner/v2.1.1/elf.h
@@ -424,7 +422,6 @@ jobs:
424422
clang -c arghandling.c
425423
clang -o elf-cleaner arghandling.o elf-cleaner.cpp -DCOPYRIGHT=\"foo\" -DPACKAGE_NAME=\"termux-elf-cleaner\" -DPACKAGE_VERSION=\"2.2.1\"
426424
./elf-cleaner --api-level $ANDROID_API_LEVEL pack/{generate-manual,math,repeat,roll} || true
427-
fi
428425
429426
cp swift-crypto/.build/$TARGET/debug/swift-cryptoPackageTests.xctest pack
430427
echo 'adb shell /data/local/tmp/pack/swift-cryptoPackageTests.xctest' >> ~/test-toolchain.sh

0 commit comments

Comments
 (0)