Skip to content

Update checkout for swift-syntax. #28087

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

Conversation

dan-zheng
Copy link
Contributor

Related to swift-DEVELOPMENT-SNAPSHOT-2019-10-31-a -> tensorflow merge: #28080


Fixes the following error from ./swift/utils/build-toolchain-tensorflow --pkg on macOS:

$ ./swift/utils/build-toolchain-tensorflow --pkg
...
+ /Users/danielzheng/swift-merge/swift-syntax/build-script.py --build-dir /Users/danielzheng/swift-merge/build/buildbot_osx/swiftsyntax-macosx-x86_64 --toolchain /Users/danielzheng/swift-merge/swift/swift-nightly-install/Library/Developer/Toolchains/swift-tensorflow-LOCAL-2019-11-05-a.xctoolchain --filecheck-exec /Users/danielzheng/swift-merge/build/buildbot_osx/llvm-macosx-x86_64/bin/FileCheck --release --verbose
usage: build-script.py [-h] [--build-dir BUILD_DIR] [-v] [-r]
                       [--add-source-locations] [--install]
                       [--generate-xcodeproj] [--xcconfig-path XCCONFIG_PATH]
                       [--dylib-dir DYLIB_DIR]
                       [--swiftmodule-dir SWIFTMODULE_DIR] [--disable-sandbox]
                       [--degyb-only] [--degyb-tar-path DEGYB_TAR_PATH] [-t]
                       [--swift-build-exec SWIFT_BUILD_EXEC]
                       [--swift-test-exec SWIFT_TEST_EXEC]
                       [--swiftc-exec SWIFTC_EXEC]
                       [--syntax-parser-header-dir SYNTAX_PARSER_HEADER_DIR]
                       [--syntax-parser-lib-dir SYNTAX_PARSER_LIB_DIR]
                       [--swift-syntax-test-exec SWIFT_SYNTAX_TEST_EXEC]
                       [--filecheck-exec FILECHECK_EXEC]
build-script.py: error: unrecognized arguments: --toolchain /Users/danielzheng/swift-merge/swift/swift-nightly-install/Library/Developer/Toolchains/swift-tensorflow-LOCAL-2019-11-05-a.xctoolchain

Related upstream patches:

build-script.py now accepts a --toolchain argument.


However, this led to another error while building SourceKitStressTester:

$ ./swift/utils/build-toolchain-tensorflow --pkg
** Building SwiftSyntax **
/Users/danielzheng/swift-merge/swift/swift-nightly-install/Library/Developer/Toolchains/swift-tensorflow-LOCAL-2019-11-05-a.xctoolchain/usr/bin/swift build --package-path /Users/danielzheng/swift-merge/swift-syntax --configuration release --build-path /Users/danielzheng/swift-merge/build/buildbot_osx/swiftsyntax-macosx-x86_64 --verbose --product SwiftSyntax
+ /Users/danielzheng/swift-merge/swift-syntax/build-script.py --build-dir /Users/danielzheng/swift-merge/build/buildbot_osx/swiftsyntax-macosx-x86_64 --toolchain /Users/danielzheng/swift-merge/swift/swift-nightly-install/Library/Developer/Toolchains/swift-tensorflow-LOCAL-2019-11-05-a.xctoolchain --filecheck-exec /Users/danielzheng/swift-merge/build/buildbot_osx/llvm-macosx-x86_64/bin/FileCheck --release --dylib-dir /Users/danielzheng/swift-merge/swift/swift-nightly-install/Library/Developer/Toolchains/swift-tensorflow-LOCAL-2019-11-05-a.xctoolchain/usr/lib/swift/macosx --install --verbose
--- build-script.py: note: changing id in /Users/danielzheng/swift-merge/build/buildbot_osx/swiftsyntax-macosx-x86_64/release/libSwiftSyntax.dylib: install_name_tool -id @rpath/libSwiftSyntax.dylib /Users/danielzheng/swift-merge/build/buildbot_osx/swiftsyntax-macosx-x86_64/release/libSwiftSyntax.dylib
--- build-script.py: note: removing RPATH from /Users/danielzheng/swift-merge/build/buildbot_osx/swiftsyntax-macosx-x86_64/release/libSwiftSyntax.dylib: install_name_tool -delete_rpath /Users/danielzheng/swift-merge/swift/swift-nightly-install/Library/Developer/Toolchains/swift-tensorflow-LOCAL-2019-11-05-a.xctoolchain/usr/lib/swift/macosx /Users/danielzheng/swift-merge/build/buildbot_osx/swiftsyntax-macosx-x86_64/release/libSwiftSyntax.dylib
--- build-script.py: note: installing libSwiftSyntax.dylib: rsync -a /Users/danielzheng/swift-merge/build/buildbot_osx/swiftsyntax-macosx-x86_64/release/libSwiftSyntax.dylib /Users/danielzheng/swift-merge/swift/swift-nightly-install/Library/Developer/Toolchains/swift-tensorflow-LOCAL-2019-11-05-a.xctoolchain/usr/lib/swift/macosx/libSwiftSyntax.dylib
+ /Users/danielzheng/swift-merge/swift-stress-tester/build-script-helper.py build --package-dir SourceKitStressTester --toolchain /Users/danielzheng/swift-merge/swift/swift-nightly-install/Library/Developer/Toolchains/swift-tensorflow-LOCAL-2019-11-05-a.xctoolchain --config release --build-dir /Users/danielzheng/swift-merge/build/buildbot_osx/skstresstester-macosx-x86_64 --verbose
Fetching https://github.com/apple/swift-package-manager.git
Fetching https://github.com/apple/swift-syntax.git
https://github.com/apple/swift-syntax.git @ master-gen: error: terminated(128): git -C /Users/danielzheng/swift-merge/build/buildbot_osx/skstresstester-macosx-x86_64/repositories/swift-syntax-cb9339b1 rev-parse --verify 'master-gen^{commit}' output:
    fatal: Needed a single revision

FAIL: Building SourceKitStressTester failed

I'm not sure what's the cause - not investigating further but happy to continue testing macOS toolchain builds!

@dan-zheng dan-zheng added the tensorflow This is for "tensorflow" branch PRs. label Nov 5, 2019
@dan-zheng dan-zheng requested a review from marcrasi November 5, 2019 20:42
@marcrasi marcrasi merged commit 8254ae5 into swiftlang:tensorflow-merge Nov 5, 2019
@AnthonyLatsis AnthonyLatsis added the update-checkout Area → utils: the `update-checkout` script label Sep 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tensorflow This is for "tensorflow" branch PRs. update-checkout Area → utils: the `update-checkout` script
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants