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

[catch2] Update to version 2.13.7 #19376

Merged
merged 9 commits into from
Aug 13, 2021
Merged

Conversation

Ryan-rsm-McKenzie
Copy link
Contributor

Describe the pull request

  • What does your PR fix?

    Updates Catch2 to 2.13.7. Also fixes [Catch2] update to 2.13.4 #16938

  • Which triplets are supported/not supported? Have you updated the CI baseline?

    Just an update

  • Does your PR follow the maintainer guide?

    Yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    Yes

@JonLiu1993 JonLiu1993 self-assigned this Aug 5, 2021
@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label Aug 5, 2021
@JonLiu1993 JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed info:reviewed Pull Request changes follow basic guidelines labels Aug 6, 2021
ports/catch2/portfile.cmake Outdated Show resolved Hide resolved
ports/catch2/portfile.cmake Outdated Show resolved Hide resolved
@JonLiu1993 JonLiu1993 added info:reviewed Pull Request changes follow basic guidelines and removed requires:author-response labels Aug 6, 2021
@JonLiu1993 JonLiu1993 removed the info:reviewed Pull Request changes follow basic guidelines label Aug 12, 2021
@Ryan-rsm-McKenzie
Copy link
Contributor Author

rtaudio failed because it attempted to link libjack when it wasn't present. It looks to me like this line should be checking JACK_LIB_FOUND instead of JACK_LIB:
https://github.com/thestk/rtaudio/blob/a68a68a8c4cdf79c2a5242e985a40becd79114c4/CMakeLists.txt#L16
Additionally, we should be passing RTAUDIO_API_JACK=OFF to rtaudio, since it's not listed in the port dependencies:
https://github.com/thestk/rtaudio/blob/a68a68a8c4cdf79c2a5242e985a40becd79114c4/CMakeLists.txt#L57

@BillyONeal
Copy link
Member

I believe that was done by #19516

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout c801072693edcd0704d187131d9078fcd089dbf2 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/c-/catch2.json b/versions/c-/catch2.json
index 1bda24d..5986f9e 100644
--- a/versions/c-/catch2.json
+++ b/versions/c-/catch2.json
@@ -5,6 +5,11 @@
       "version-semver": "2.13.7",
       "port-version": 0
     },
+    {
+      "git-tree": "ef9387df5727b456d41890580ac51c03cae9bb25",
+      "version-semver": "2.13.6",
+      "port-version": 2
+    },
     {
       "git-tree": "bd73b1d5e8994fb0327c333cd77400577f05e31c",
       "version-semver": "2.13.6",

@JonLiu1993 JonLiu1993 added the info:reviewed Pull Request changes follow basic guidelines label Aug 13, 2021
@BillyONeal
Copy link
Member

Thanks for your help!

@BillyONeal BillyONeal merged commit 7bdf2f8 into microsoft:master Aug 13, 2021
@Ryan-rsm-McKenzie Ryan-rsm-McKenzie deleted the catch2 branch August 14, 2021 01:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Catch2] update to 2.13.4
3 participants