Skip to content

use swift-cmark/gfm instead of /main #40188

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 3 commits into from
May 2, 2022
Merged

use swift-cmark/gfm instead of /main #40188

merged 3 commits into from
May 2, 2022

Conversation

QuietMisdreavus
Copy link
Contributor

@QuietMisdreavus QuietMisdreavus commented Nov 15, 2021 •
edited
Loading

Resolves rdar://90461181

This PR (and its related PRs on swift-cmark/gfm) switches the branch used by swiftMarkup to the gfm branch of swift-cmark, to unify the development effort on swift-cmark. Note that this PR does not remove the second clone of swift-cmark - that will happen later, as it requires a simultaneous PR in Swift-Markdown. This PR is primarily to allow gfm to be built in the toolchain in the cmark clone.

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#27

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#27

@swift-ci Please build toolchain

@swift-ci
Copy link
Contributor

Build failed
Swift Test Linux Platform
Git Sha - d7d65c7

@QuietMisdreavus QuietMisdreavus force-pushed the QuietMisdreavus/cmark branch from d7d65c7 to 4cf55dd Compare March 8, 2022 23:13
@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#27

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#27

@swift-ci Please build toolchain

@QuietMisdreavus
Copy link
Contributor Author

It turns out i need to merge swiftlang/swift-cmark#30 so that make test can work. Alternately, i can extract just the commit that re-enables make test into a separate PR, since that PR does something unrelated and is based on top of swiftlang/swift-cmark#29. I'll try to do the latter first.

@QuietMisdreavus
Copy link
Contributor Author

Update: some quick tests have revealed that both of those PRs are needed - the "merge upstream" one to enable footnotes to work, and the "add new extension points" one so that footnotes and inline attributes can work alongside each other.

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test Linux

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain Linux

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test Linux

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain Linux

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test Linux

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test Linux

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain Linux

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test macOS

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain macOS

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please test Windows

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain Windows

@QuietMisdreavus
Copy link
Contributor Author

swiftlang/swift-cmark#37

@swift-ci Please build toolchain macOS

@QuietMisdreavus QuietMisdreavus mentioned this pull request Mar 18, 2022
Merged
@QuietMisdreavus
Copy link
Contributor Author

From what i can tell, the Linux toolchain failure is a broader CI issue, and the Windows toolchain failure is being fixed by swiftlang/swift-package-manager#4235. All the required swift-cmark PRs have been merged, so once the Mac toolchain build finishes (and/or the SwiftPM Windows fix lands) i'll run all the tests again.

@QuietMisdreavus QuietMisdreavus marked this pull request as ready for review March 18, 2022 16:18
@QuietMisdreavus QuietMisdreavus changed the title [WIP] use swift-cmark/gfm instead of /main use swift-cmark/gfm instead of /main Mar 18, 2022
@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please build toolchain macOS

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test Linux

1 similar comment
@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test Linux

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please build toolchain macOS

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please build toolchain Windows

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test source compatibility

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please build toolchain macOS

@QuietMisdreavus
Copy link
Contributor Author

@shahmishal @gottesmm @akyrtzi This PR is ready for a final review.

@shahmishal
Copy link
Member

@swift-ci test

@shahmishal shahmishal merged commit d292a85 into main May 2, 2022
@shahmishal shahmishal deleted the QuietMisdreavus/cmark branch May 2, 2022 17:20
@QuietMisdreavus QuietMisdreavus mentioned this pull request May 3, 2022
Merged
@QuietMisdreavus QuietMisdreavus mentioned this pull request May 25, 2022
Merged
1 task
@QuietMisdreavus QuietMisdreavus mentioned this pull request Jun 13, 2022
Merged
@QuietMisdreavus QuietMisdreavus mentioned this pull request Jul 21, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akyrtzi akyrtzi akyrtzi approved these changes

@shahmishal shahmishal shahmishal approved these changes

@gottesmm gottesmm Awaiting requested review from gottesmm

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

Successfully merging this pull request may close these issues.
4 participants
@QuietMisdreavus @swift-ci @shahmishal @akyrtzi