Skip to content

use "cmark" instead of "swift-cmark-gfm" in the toolchain build #47

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
Jun 10, 2022

Conversation

QuietMisdreavus
Copy link
Contributor

Bug/issue #, if applicable: rdar://90461704

Summary

The Swift compiler is now using the gfm branch of swift-cmark, so the cmark directory of the build structure is using the same branch as swift-cmark-gfm. This PR updates swift-markdown's package files to point to the same repository directory that the compiler is using, so that the extra clone can be cleaned up.

Dependencies

None (The required work landed in apple/swift on May 2)

Testing

No behavior change in swift-markdown.

Checklist

Make sure you check off the following items. If they cannot be completed, provide a reason.

  • [ n/a ] Added tests
  • Ran the ./bin/test script and it succeeded
  • [ n/a ] Updated documentation if necessary

@QuietMisdreavus
Copy link
Contributor Author

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

Updated the package name used for cmark and rebased onto the latest main.

@swift-ci Please test

@QuietMisdreavus
Copy link
Contributor Author

I built a toolchain with this change in swiftlang/swift#59085 and it works and passes tests, so i'm going to merge this.

@QuietMisdreavus QuietMisdreavus merged commit d03ad20 into swiftlang:main Jun 10, 2022
@QuietMisdreavus QuietMisdreavus deleted the unified-cmark branch June 10, 2022 18:50
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