Update to libmongoc-1.16.0-dev #1060
Conversation
src/LIBMONGOC_VERSION_CURRENT
Outdated
| @@ -1 +1 @@ | |||
| 1.16.0-20191029+gitce14000d77 | |||
| 1.11.1-20191113+gitbef4cf349d | |||
There was a problem hiding this comment.
This is incorrect. My original commit in #1059 updated this to 1.16.0-20191112+git622b3c8966.
Assuming you just cherry-picked my commit, how did you end up with this change?
There was a problem hiding this comment.
I updated it further to also add in support for 64-bit wTimeoutMs and exposing session state.
There was a problem hiding this comment.
Is this a problem with running make libmongoc-version-current on your machine? I remember the script had trouble inferring the correct minor version a while back, but I thought that was fixed.
There was a problem hiding this comment.
See: https://jira.mongodb.org/browse/CDRIVER-3315
Perhaps you didn't actually have the master branch checked out?
There was a problem hiding this comment.
Both the submodule and the version number were updated to the last commit in libmongoc master: mongodb/mongo-c-driver@bef4cf3
There was a problem hiding this comment.
Sorry for the misunderstanding. gitbef4cf349d is correct in this case, but 11.1 is not.
Can you attempt running make libmongoc-version-current once more when src/libmongoc is pointing to the upstream master branch? I think the behavior you're seeing (with 11.1) is the result of checking out a specific commit but not master directly. I wouldn't expect those to be different, but perhaps they are from the script's POV (detached head?).
Consider:
$ make libmongoc-version-current
cd src/libmongoc/ && python build/calc_release_version.py > ../LIBMONGOC_VERSION_CURRENT
$ cat src/LIBMONGOC_VERSION_CURRENT
1.11.1-20191113+gitbef4cf349d
$ cd src/libmongoc
$ git fetch origin
$ git checkout origin/master
HEAD is now at bef4cf349 CDRIVER-3364 expose transaction state for session
# I believe this is still a detached head, because my prompt
# identified the branch as bef4cf349 instead of master.
$ git checkout master
Previous HEAD position was bef4cf349 CDRIVER-3364 expose transaction state for session
Switched to branch 'master'
Your branch is behind 'origin/master' by 2 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
$ cd ../../
$ make libmongoc-version-current
cd src/libmongoc/ && python build/calc_release_version.py > ../LIBMONGOC_VERSION_CURRENT
$ cat src/LIBMONGOC_VERSION_CURRENT
1.16.0-20191113+git622b3c8966
There was a problem hiding this comment.
D'oh, sorry for being so daft. I have fixed this. My apologies for not seeing this earlier.
alcaeus
force-pushed
the
update-libmongoc
branch
from
9e7aa09 to
dc0a9d3
Compare
Extracted from #1059, as this is also necessary for #1042 as well as PHPC-1438.