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

Housekeeping fixes #764

Merged
merged 11 commits into from
Feb 28, 2020
Merged

Conversation

michael-grunder
Copy link
Collaborator

This PR contains housekeeping/CI fixes.

michael-grunder and others added 8 commits February 4, 2020 11:10
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
@michael-grunder michael-grunder deleted the housekeeping-fixes branch February 9, 2020 21:17
@michael-grunder michael-grunder restored the housekeeping-fixes branch February 9, 2020 21:18
@michael-grunder
Copy link
Collaborator Author

I'll squash this when we merge it so the commit history is clean.

This fixes a bug introduced in the Travis-CI 1809 Windows build
machines.
@michael-grunder michael-grunder merged commit 38675d2 into redis:master Feb 28, 2020
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.

3 participants