Skip to content

Comments

Update spdlog to 1.4.2-p2, fixing missing cassert include#111

Merged
rbsheth merged 1 commit intocpp-pm:masterfrom
dan-42:pr.spdlog-1.4.2-p2
Jan 9, 2020
Merged

Update spdlog to 1.4.2-p2, fixing missing cassert include#111
rbsheth merged 1 commit intocpp-pm:masterfrom
dan-42:pr.spdlog-1.4.2-p2

Conversation

@dan-42
Copy link

@dan-42 dan-42 commented Dec 31, 2019

the -p2 means that I use the latest changes from spdlogs branch v1.x which includes a fix when compiling on gcc9.2 which misses an #include

Please delete the following branch hunter-1.4.2-p1 from the repo https://github.com/cpp-pm/spdlog as I created it accidently from spdlog's master-branch which is wrong.
And I do not have the privileges to delete a protected branch.

PING: @bkotzz @rbsheth

@dan-42
Copy link
Author

dan-42 commented Dec 31, 2019

All tool-chains that are also run on the 1.4.2-p0 release work. I just did not disable them.
See:
https://ci.appveyor.com/project/ingenue/hunter/builds/28559512\
https://travis-ci.org/ingenue/hunter/builds/606261633?utm_medium=notification

But If you insist, I will update the list of tool-chains, and update the PR.

@bkotzz @rbsheth

@mileschao
Copy link

@dan-42 @bkotzz @rbsheth why this PR's merge is blocked?

@bkotzz
Copy link
Member

bkotzz commented Jan 3, 2020

I’m a bit confused. You mention 1.4.2-p0, but I don’t see that branch or tag anywhere? And then -p1 was a mistake, and -p2 is the new release? Did this ever go through code review?

@dan-42
Copy link
Author

dan-42 commented Jan 3, 2020

I’m a bit confused. You mention 1.4.2-p0, but I don’t see that branch or tag anywhere? And then -p1 was a mistake, and -p2 is the new release? Did this ever go through code review?

VERSION
"1.4.2-p2"
URL
"https://github.com/cpp-pm/spdlog/archive/v1.4.2-p2.tar.gz"
Copy link
Member

Choose a reason for hiding this comment

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

This updating of spdlog's v1.x branch is confusing. Let's use the convention of last known release version + git hash for the updated version in Hunter. I created the new branch and release for you here: https://github.com/cpp-pm/spdlog/releases/tag/v1.4.2-58e6890-p0 and deleted the other, confusing branches.

For new versions, the branch name should be hunter-<version> without the p0. The release+tag adds the p0, p1, p2, etc. so that you can continue patching the same branch but have multiple releases.

Copy link
Author

Choose a reason for hiding this comment

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

you are right, that is much better. Thank you for removing the wrong branches and creating a new one.

I'll update the PR as soon as I find the time for it.

@dan-42 dan-42 force-pushed the pr.spdlog-1.4.2-p2 branch from 92eed4a to 7ca4baf Compare January 7, 2020 19:46
Removing v prefix on spdlog
@dan-42 dan-42 force-pushed the pr.spdlog-1.4.2-p2 branch from 7ca4baf to c7468d5 Compare January 7, 2020 19:52
@rbsheth
Copy link
Member

rbsheth commented Jan 7, 2020

@dan-42 Thanks for updating the PR. Looks like some toolchains failed that weren't before? Can you check them please?

@dan-42
Copy link
Author

dan-42 commented Jan 8, 2020

@rbsheth You're welcome.

The toolchains that fail, had been disabled in the last release (1.4.2-p0), see my second comment above.

But if you insist I will also disable them just to have passing tests :-)

@rbsheth
Copy link
Member

rbsheth commented Jan 8, 2020

@dan-42 Yes, please disable them. :)

@dan-42
Copy link
Author

dan-42 commented Jan 9, 2020

@rbsheth

Here are the successful builds:

Now shall I provide a PR to https://github.com/cpp-pm/hunter-testing/tree/pkg.spdlog
with my changes?
I think the documentation is not very clear here for me.

Copy link
Member

@rbsheth rbsheth left a comment

Choose a reason for hiding this comment

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

Yup, a PR to hunter-testing after pkg.template is updated works.

@rbsheth rbsheth merged commit 4f1238d into cpp-pm:master Jan 9, 2020
@rbsheth
Copy link
Member

rbsheth commented Jan 9, 2020

Released: https://github.com/cpp-pm/hunter/releases/tag/v0.23.242

@rbsheth
Copy link
Member

rbsheth commented Jan 9, 2020

Branch pkg.template has been updated https://github.com/cpp-pm/hunter-testing

@dan-42
Copy link
Author

dan-42 commented Jan 10, 2020

PR for hunter-testing: cpp-pm/hunter-testing#32

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.

4 participants