Skip to content
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

Use existing Catch2 v2.x git branch instead of deleted master #34

Merged
merged 1 commit into from
Jan 12, 2021

Conversation

vedgy
Copy link
Contributor

@vedgy vedgy commented Jan 12, 2021

Tests do not compile against the default Catch2 branch devel (where the
next major version, v3, of Catch2 is being developed).

Tests do not compile against the default Catch2 branch devel (where the
next major version, v3, of Catch2 is being developed).
@Morwenn
Copy link
Member

Morwenn commented Jan 12, 2021

Oh, good catch, thanks. I have done the same in other projects, but there's generally so little maintenance to do here that I kind of forgot about it. I am merging that once CI passes.

Speaking of which I should also move the CI to GitHub actions soon - I have code ready to use for that, so I could actually do that this week.

@vedgy
Copy link
Contributor Author

vedgy commented Jan 12, 2021

Thank you for maintaining this excellent algorithm.

@Morwenn
Copy link
Member

Morwenn commented Jan 12, 2021

No problem, it's rather low-effort, so it would have been a shame to just let it go unmaintained 😄

The OSX failures are due to issues with the CI conf - it used not to be a problem, so I guess that something changed on their side. It doesn't really matter anyway if I'm moving the CI to GitHub Actions anyway. I'm going to ignore these failures and merge anyway, thanks again for the PR!

@Morwenn Morwenn merged commit 3789245 into timsort:master Jan 12, 2021
@vedgy vedgy deleted the catch2-use-existing-branch branch January 12, 2021 13:17
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