Skip to content

build: remove the requirement to checkout swift-syntax #7486

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Apr 25, 2024
Merged

build: remove the requirement to checkout swift-syntax #7486

merged 1 commit into from
Apr 25, 2024

Conversation

compnerd
Copy link
Member

In the case that a shared copy of swift-syntax is being used to build, allow the sources to be unavailable. If the user specifies SWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE, that will be preferred, otherwise, we fallback to the upstream git repository.

@compnerd compnerd requested a review from DougGregor April 23, 2024 16:02
@compnerd
Copy link
Member Author

@swift-ci please test

DougGregor
DougGregor approved these changes Apr 23, 2024
View reviewed changes
BuildSupport/SwiftSyntax/CMakeLists.txt Outdated
Comment on lines 10 to 11
FetchContent_Declare(SwiftSyntax
GIT_REPOSITORY https://github.com/apple/swift-syntax)
Copy link
Member

Choose a reason for hiding this comment

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

Ahh, that's how you do it! Very nice

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please smoke test Linux platform

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd compnerd enabled auto-merge (squash) April 23, 2024 17:08
@compnerd
Copy link
Member Author

@swift-ci please smoke test Linux platform

@compnerd
Copy link
Member Author

@swift-ci please test Linux platform

@compnerd
Copy link
Member Author

It seems that swift-syntax is not checked out in the smoke test environment? CC: @shahmishal @DougGregor

@compnerd
Copy link
Member Author

env MACOSX_DEPLOYMENT_TARGET=12.0 /home/build-user/build/cmake-linux-x86_64/bin/cmake -G Ninja -DCMAKE_MAKE_PROGRAM=/home/build-user/build/buildbot_incremental/ninja-build/ninja -DCMAKE_BUILD_TYPE:=Debug -DCMAKE_Swift_FLAGS=' -module-cache-path "/home/build-user/build/buildbot_incremental/swiftpm-linux-x86_64/x86_64-unknown-linux-gnu/swift-certificates/module-cache"' -DCMAKE_Swift_COMPILER:=/home/build-user/build/buildbot_incremental/toolchain-linux-x86_64/usr/bin/swiftc -DCMAKE_C_COMPILER:=/home/build-user/build/buildbot_incremental/toolchain-linux-x86_64/usr/bin/clang -DCMAKE_AR:PATH=/usr/bin/ar -DCMAKE_RANLIB:PATH=/usr/bin/ranlib -DSwiftASN1_DIR=/home/build-user/build/buildbot_incremental/swiftpm-linux-x86_64/x86_64-unknown-linux-gnu/swift-asn1/cmake/modules -DSwiftCrypto_DIR=/home/build-user/build/buildbot_incremental/swiftpm-linux-x86_64/x86_64-unknown-linux-gnu/swift-crypto/cmake/modules /home/build-user/swiftpm/../swift-certificates

I don't seem to see a SWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE in here. This is going to require help from @shahmishal.

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please test

@compnerd
Copy link
Member Author

@swift-ci please test Linux platform

@compnerd
build: remove the requirement to checkout swift-syntax
118c4cf 
In the case that a shared copy of swift-syntax is being used to build,
allow the sources to be unavailable. If the user specifies
`SWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE`, that will be preferred,
otherwise, we fallback to the upstream git repository.
@compnerd
Copy link
Member Author

@swift-ci please test Linux platform

@DougGregor DougGregor mentioned this pull request Apr 24, 2024
Merged
@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd
Copy link
Member Author

@swift-ci please test macOS platform

@compnerd
Copy link
Member Author

@swift-ci please test Windows platform

@compnerd compnerd merged commit dbd8945 into swiftlang:main Apr 25, 2024
@compnerd compnerd deleted the checkout branch April 25, 2024 02:05
DougGregor pushed a commit to DougGregor/swift-package-manager that referenced this pull request Apr 25, 2024
@compnerd @DougGregor
build: remove the requirement to checkout swift-syntax (swiftlang#7486)
e509ad9 
In the case that a shared copy of swift-syntax is being used to build,
allow the sources to be unavailable. If the user specifies
`SWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE`, that will be preferred,
otherwise, we fallback to the upstream git repository.

(cherry picked from commit dbd8945)
furby-tm pushed a commit to wabiverse/swift-package-manager that referenced this pull request May 15, 2024
@compnerd @furby-tm
build: remove the requirement to checkout swift-syntax (swiftlang#7486)
904faad 
In the case that a shared copy of swift-syntax is being used to build,
allow the sources to be unavailable. If the user specifies
`SWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE`, that will be preferred,
otherwise, we fallback to the upstream git repository.
furby-tm pushed a commit to wabiverse/swift-package-manager that referenced this pull request May 15, 2024
@compnerd @furby-tm
build: remove the requirement to checkout swift-syntax (swiftlang#7486)
faa798d 
In the case that a shared copy of swift-syntax is being used to build,
allow the sources to be unavailable. If the user specifies
`SWIFTPM_PATH_TO_SWIFT_SYNTAX_SOURCE`, that will be preferred,
otherwise, we fallback to the upstream git repository.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DougGregor DougGregor DougGregor approved these changes

@bnbarham bnbarham bnbarham approved these changes

@MaxDesiatov MaxDesiatov Awaiting requested review from MaxDesiatov

@tomerd tomerd Awaiting requested review from tomerd

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@compnerd @DougGregor @bnbarham