Android: remove unneeded changes from #528, since build-{docker,local} are not run on the CI anyway#536
Android: remove unneeded changes from #528, since build-{docker,local} are not run on the CI anyway#536finagolfin wants to merge 1 commit intoswiftlang:mainfrom
build-{docker,local} are not run on the CI anyway#536Conversation
…ocker,local}` are not run on the CI anyway
| ANDROID_NDK_VERSION=android-ndk-r27d | ||
| ANDROID_API=28 | ||
| ANDROID_NDK_VERSION=android-ndk-r28c | ||
| ANDROID_API=24 |
There was a problem hiding this comment.
Just set this as our recommendation, since the official CI override these variablesdon't use these two scripts anyway.
|
|
||
| # This `git grep` invocation in a trunk test fails in our Docker for some | ||
| # reason, so just turn it into a plain `grep` again. | ||
| perl -pi -e 's:"git",:#:' ${WORKDIR}/source/swift-project/swift/test/Misc/verify-swift-feature-testing.test-sh |
There was a problem hiding this comment.
We never knew why this was needed, some filesystem issue in our local testing that presumably doesn't affect whatever Docker config the official CI uses?
@justice-adams-apple, can you try removing this substitution from the official Android CI script too and see if it still works?
| # reason, so just turn it into a plain `grep` again. | ||
| perl -pi -e 's:"git",:#:' ${WORKDIR}/source/swift-project/swift/test/Misc/verify-swift-feature-testing.test-sh | ||
|
|
||
| # Work around swiftlang/swift-driver#1822 for now |
There was a problem hiding this comment.
Unfortunately, this toolchain issue is still unresolved, so still need this.
| perl -pi -g -we "s#(call rm ... \".\{LIBDISPATCH_BUILD_DIR\}\"\n(\s+)fi\n)#\1\2if [[ -d \"\\\${ANDROID_NDK}\" ]]; then call ln -sf \"\\\${SWIFT_BUILD_PATH}/lib/swift\" \"\\\${ANDROID_NDK}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib\"; fi#" ${WORKDIR}/source/swift-project/swift/utils/build-script-impl | ||
|
|
||
| # disable backtrace() for Android (needs either API33+ or libandroid-execinfo, or to manually add in backtrace backport) | ||
| perl -pi -e 's;os\(Android\);os\(AndroidDISABLED\);g' ${WORKDIR}/source/swift-project/swift-testing/Sources/Testing/SourceAttribution/Backtrace.swift |
There was a problem hiding this comment.
Fixed by swiftlang/swift-testing#1356, which is in 6.3 also, but we kept this patch around since we nominally supported 6.2 also.
Now that 6.3 is out, we don't need it, so the CI team can also remove this line from your Android CI scripts.
| rm ${WORKDIR}/source/swift-project/swift/test/Interop/SwiftToCxx/stdlib/stdlib-in-cxx-no-diagnostics-generated-header.cpp | ||
| rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_decoding_packs.swift | ||
| rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering.swift | ||
| rm ${WORKDIR}/source/swift-project/swift/test/Reflection/typeref_lowering_packs.swift |
There was a problem hiding this comment.
These tests were all disabled upstream in swiftlang/swift#86034 and swiftlang/swift#88056 instead, while typeref_lowering.swift was likely fixed by the recent build directory deletions.
|
I'm setting up GitHub CI with |
1 participant
We initially added this script following the static linux SDK's lead, but I forgot that these scripts are not used on the Android CI anyway, so remove unnecessary changes.