Skip to content

[android] Split the Android CI build presets. #28163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2019

Conversation

drodriguez
Copy link
Contributor

@drodriguez drodriguez commented Nov 8, 2019

By not depending on buildbot_linux, the changes there will not affect
the Android builders. It will mean having to move the intended changes
manually, but it will hopefully be more stable.

The Android CI builds started failing after #27855 in
https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android/4401/ and https://ci-external.swift.org/job/oss-swift-RA-linux-ubuntu-16.04-android-arm64/2671/.

[Edit: correct PR link]

@drodriguez
Copy link
Contributor Author

I'm building locally the preset, but I don’t have a way to force the PR in the Android CI machines. Hopefully I copied everything that was in the buildbot_linux preset.

@swift-ci please smoke test

Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just ran a quick diff of the generated arguments. Looking really good from my perspective. One thing I noticed is that you are no longer passing --skip-build-benchmarks. Unless the benchmarks are not being built anyway or you need them, I would specify it because they take about 5 minutes to build.

Diff
'--lit-args=-v --time-tests'					'--lit-args=-v --time-tests'
'--llvm-install-components=llvm-cov;llvm-profdata;IndexStore;	'--llvm-install-components=llvm-cov;llvm-profdata;IndexStore;
'--swift-install-components=autolink-driver;compiler;clang-re	'--swift-install-components=autolink-driver;compiler;clang-re
--android							--android
--android-api-level=21						--android-api-level=21
--android-icu-data=arm_dir/libicudataswift.so			--android-icu-data=arm_dir/libicudataswift.so
--android-icu-i18n-include=arm_dir/icu/source/i18n		--android-icu-i18n-include=arm_dir/icu/source/i18n
--android-icu-i18n=arm_dir/libicui18nswift.so			--android-icu-i18n=arm_dir/libicui18nswift.so
--android-icu-uc-include=arm_dir/icu/source/common		--android-icu-uc-include=arm_dir/icu/source/common
--android-icu-uc=arm_dir/libicuucswift.so			--android-icu-uc=arm_dir/libicuucswift.so
--android-ndk=ndk_path						--android-ndk=ndk_path
--assertions							--assertions
--assertions						      <
--build-ninja							--build-ninja
--build-subdir=buildbot_linux					--build-subdir=buildbot_linux
--build-swift-static-sdk-overlay				--build-swift-static-sdk-overlay
--build-swift-static-stdlib					--build-swift-static-stdlib
--build-swift-stdlib-unittest-extra				--build-swift-stdlib-unittest-extra
--extra-cmake-options=-DSWIFT_ENABLE_LLD_LINKER:BOOL=OFF	--extra-cmake-options=-DSWIFT_ENABLE_LLD_LINKER:BOOL=OFF
--foundation						      <
--skip-build-foundation					      <
--install-foundation					      <
--host-test							--host-test
--indexstore-db						      <
--indexstore-db=0					      <
--install-destdir=install_destdir				--install-destdir=install_destdir
--install-libcxx						--install-libcxx
--install-libicu						--install-libicu
--install-prefix=/usr						--install-prefix=/usr
--install-swift							--install-swift
--installable-package=installable_package			--installable-package=installable_package
--libcxx							--libcxx
--libdispatch						      <
--skip-build-libdispatch				      <
--install-libdispatch					      <
--libicu							--libicu
--llbuild						      <
--skip-build-llbuild					      <
--install-llbuild					      <
--lldb							      <
--skip-build-lldb					      <
--install-lldb						      <
--lldb-test-swift-only					      <
--long-test							--long-test
--no-swift-stdlib-assertions					--no-swift-stdlib-assertions
--reconfigure							--reconfigure
--release							--release
--release						      <
--skip-build-benchmarks					      <
--skip-build-playgroundsupport					--skip-build-playgroundsupport
--skip-test-linux						--skip-test-linux
--sourcekit-lsp						      <
--sourcekit-lsp=0					      <
--install-sourcekit-lsp					      <
--stress-test							--stress-test
--swift-enable-ast-verifier=0					--swift-enable-ast-verifier=0
--swiftpm						      <
--swiftpm=0						      <
--install-swiftpm					      <
--install-swiftpm=0					      <
--swiftsyntax						      <
--test								--test
--test-installable-package				      <
--test-installable-package=				      <
--test-optimized						--test-optimized
--toolchain-benchmarks					      <
--toolchain-benchmarks=0				      <
--validation-test						--validation-test
--xctest						      <
--skip-build-xctest					      <
--install-xctest					      <
utils/build-script						utils/build-script

By not depending on buildbot_linux, the changes there will not affect
the Android builders. It will mean having to move the intended changes
manually, but it will hopefully be more stable.
@drodriguez drodriguez force-pushed the android-split-build-preset branch from df96b5b to c366dc3 Compare November 9, 2019 00:43
@drodriguez
Copy link
Contributor Author

Re-added the --skip-build-benchmarks as Alex proposed. It doesn't seems to affect the build result that much, but it might save some time. Thanks!

@swift-ci please smoke test

Copy link
Member

@ahoppen ahoppen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good now. Thanks for taking care of this!

@drodriguez drodriguez merged commit 2748207 into swiftlang:master Nov 9, 2019
@drodriguez drodriguez deleted the android-split-build-preset branch November 9, 2019 08:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants