Skip to content

vcpkg_from_git: Add support for git over ssh #9446

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.

Sign up for GitHub

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

Merged
dan-shaw merged 6 commits into from
Apr 1, 2020
Merged

vcpkg_from_git: Add support for git over ssh #9446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9b81b16
vcpkg_from_git: Add support for git over ssh
Dec 23, 2019
377ce3f
vcpkg_from_git: append ssh bin directory to path
Mar 14, 2020
0d608ee
vcpkg_from_git: fix function signature on non windows platforms
Mar 20, 2020
a878a10
Revert "vcpkg_from_git: fix function signature on non windows platforms"
Mar 28, 2020
55f9002
Revert "vcpkg_from_git: append ssh bin directory to path"
Mar 28, 2020
d876447
Partial Revert "vcpkg_from_git: Add support for git over ssh"
Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/maintainers/vcpkg_from_git.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Specifies the out-variable that will contain the extracted location.
This should be set to `SOURCE_PATH` by convention.

### URL
The url of the git repository. Must start with `https`.
The url of the git repository.

### REF
The git sha of the commit to download.
Expand Down
9 changes: 1 addition & 8 deletions scripts/cmake/vcpkg_from_git.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
## This should be set to `SOURCE_PATH` by convention.
##
## ### URL
## The url of the git repository. Must start with `https`.
## The url of the git repository.
##
## ### REF
## The git sha of the commit to download.
Expand Down Expand Up @@ -49,13 +49,6 @@ function(vcpkg_from_git)
message(FATAL_ERROR "The git url must be specified")
endif()

if( NOT _vdud_URL MATCHES "^https:")
# vcpkg_from_git does not support a SHA256 parameter because hashing the git archive is
# not stable across all supported platforms. The tradeoff is to require https to download
# and the ref to be the git sha (i.e. not things that can change like a label)
message(FATAL_ERROR "The git url must be https")
endif()

if(NOT DEFINED _vdud_REF)
message(FATAL_ERROR "The git ref must be specified.")
endif()
Expand Down
6 changes: 6 additions & 0 deletions toolsrc/src/vcpkg/base/system.process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,12 @@ namespace vcpkg
// Enables proxy information to be passed to Curl, the underlying download library in cmake.exe
L"http_proxy",
L"https_proxy",
// Environment variables to tell git to use custom SSH executable or command
L"GIT_SSH",
L"GIT_SSH_COMMAND",
// Environment variables needed for ssh-agent based authentication
L"SSH_AUTH_SOCK",
L"SSH_AGENT_PID",
// Enables find_package(CUDA) and enable_language(CUDA) in CMake
L"CUDA_PATH",
L"CUDA_PATH_V9_0",
Expand Down