chore: retrieve repo via vcpkg by commit hash (#6829)

scotthart · web-flow · commit ddb4e2501859 · 2021-06-22T01:16:34.000Z
* chore: retrieve repo via vcpkg by commit hash
diff --git a/ci/cloudbuild/builds/lib/vcpkg.sh b/ci/cloudbuild/builds/lib/vcpkg.sh
@@ -24,15 +24,16 @@ source module ci/lib/io.sh
 
 TIMEFORMAT="==> 🕑 vcpkg installed in %R seconds"
 time {
-  VCPKG_RELEASE_VERSION="2021.05.12"
+  VCPKG_RELEASE_VERSION="6e024e744e7717c06ddacd5089401109c6298553"
   VCPKG_ROOT_DIR="${HOME}/vcpkg-${VCPKG_RELEASE_VERSION}"
   io::log_h2 "Installing vcpkg ${VCPKG_RELEASE_VERSION} -> ${VCPKG_ROOT_DIR}"
   if [[ ! -d "${VCPKG_ROOT_DIR}" ]]; then
     mkdir -p "${VCPKG_ROOT_DIR}"
     # vcpkg needs git history to support versioning, so we clone a recent
     # release tag rather than just extracting a tarball without history.
-    git clone https://github.com/microsoft/vcpkg.git "${VCPKG_ROOT_DIR}" \
-      -b "${VCPKG_RELEASE_VERSION}"
+    git clone https://github.com/microsoft/vcpkg.git "${VCPKG_ROOT_DIR}"
+    git -C "${VCPKG_ROOT_DIR}" checkout "${VCPKG_RELEASE_VERSION}"
+    pwd
   fi
   env -C "${VCPKG_ROOT_DIR}" CC="ccache ${CC}" CXX="ccache ${CXX}" \
     ./bootstrap-vcpkg.sh
diff --git a/ci/kokoro/macos/builds/quickstart-cmake.sh b/ci/kokoro/macos/builds/quickstart-cmake.sh
@@ -31,7 +31,7 @@ brew list --versions pkg-config || brew install pkg-config
 vcpkg_dir="${HOME}/vcpkg-quickstart"
 mkdir -p "${vcpkg_dir}"
 io::log "Downloading vcpkg into ${vcpkg_dir}..."
-curl -sSL "https://github.com/microsoft/vcpkg/archive/2021.05.12.tar.gz" |
+curl -sSL "https://github.com/microsoft/vcpkg/archive/6e024e744e7717c06ddacd5089401109c6298553.tar.gz" |
   tar -C "${vcpkg_dir}" --strip-components=1 -zxf -
 (
   cd "${vcpkg_dir}"
diff --git a/ci/kokoro/windows/build-cmake-dependencies.ps1 b/ci/kokoro/windows/build-cmake-dependencies.ps1
@@ -48,7 +48,7 @@ if ($args.count -ge 1) {
     $vcpkg_flags=("--triplet", "${env:VCPKG_TRIPLET}")
 }
 $vcpkg_dir = "cmake-out\${vcpkg_base}"
-$vcpkg_version = "2021.05.12"
+$vcpkg_version = "6e024e744e7717c06ddacd5089401109c6298553"
 $Env:VCPKG_FEATURE_FLAGS = "-manifests"
 
 New-Item -ItemType Directory -Path "cmake-out" -ErrorAction SilentlyContinue

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ brew list --versions pkg-config \|\| brew install pkg-config`
`31`	`31`	`vcpkg_dir="${HOME}/vcpkg-quickstart"`
`32`	`32`	`mkdir -p "${vcpkg_dir}"`
`33`	`33`	`io::log "Downloading vcpkg into ${vcpkg_dir}..."`
`34`		`-curl -sSL "https://github.com/microsoft/vcpkg/archive/2021.05.12.tar.gz" \|`
	`34`	`+curl -sSL "https://github.com/microsoft/vcpkg/archive/6e024e744e7717c06ddacd5089401109c6298553.tar.gz" \|`
`35`	`35`	`tar -C "${vcpkg_dir}" --strip-components=1 -zxf -`
`36`	`36`	`(`
`37`	`37`	`cd "${vcpkg_dir}"`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ if ($args.count -ge 1) {`
`48`	`48`	`$vcpkg_flags=("--triplet", "${env:VCPKG_TRIPLET}")`
`49`	`49`	`}`
`50`	`50`	`$vcpkg_dir = "cmake-out\${vcpkg_base}"`
`51`		`-$vcpkg_version = "2021.05.12"`
	`51`	`+$vcpkg_version = "6e024e744e7717c06ddacd5089401109c6298553"`
`52`	`52`	`$Env:VCPKG_FEATURE_FLAGS = "-manifests"`
`53`	`53`
`54`	`54`	`New-Item -ItemType Directory -Path "cmake-out" -ErrorAction SilentlyContinue`