-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
Housekeeping fixes #764
Merged
michael-grunder
merged 11 commits into
redis:master
from
michael-grunder:housekeeping-fixes
Feb 28, 2020
Merged
Housekeeping fixes #764
michael-grunder
merged 11 commits into
redis:master
from
michael-grunder:housekeeping-fixes
Feb 28, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Travis upgraded their Windows workers from 1803 to 1809 which broke the current windows build. We don't appear to be actually running any tests, so we may be able to just build directly with cmake (as opposed to ninja).
Configure for Windows 32 bit: 1. open 'x86 Native Tools Command Prompt for VS 2019', navigate to your source directory 2. configure with cmake: cmake -G "Visual Studio 16 2019" -A Win32 -DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/out32/hiredis/ . Configure for Windows 64 bit: 1. open 'x64 Native Tools Command Prompt for VS 2019', navigate to your source directory 2. configure with cmake: cmake -G "Visual Studio 16 2019" -DCMAKE_CONFIGURATION_TYPES=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=/out64/hiredis/ . Finally, build & install: msbuild.exe /p:Configuration=RelWithDebInfo ALL_BUILD.vcxproj msbuild.exe /p:Configuration=RelWithDebInfo INSTALL.vcxproj
I'll squash this when we merge it so the commit history is clean. |
This was referenced Feb 9, 2020
Also fix a little typo in a comment.
This was referenced Feb 11, 2020
This fixes a bug introduced in the Travis-CI 1809 Windows build machines.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains housekeeping/CI fixes.
extern "C"
toalloc.h
andhiredis_ssl.h
(extern "C" missing from hiredis_ssl.h #750, Adds extern C if we detect C++ #759)alloc.h
to the CMakeLists.txt and creates a Windows.def
file. (add module definition file, let vs2019 build correct binary via cmake #760).