Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion ci/scripts/install_gcs_testbench.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,13 @@ if [[ $(id -un) == "root" ]]; then
# Install globally as /root/.local/bin is typically not in $PATH
pipx_flags+=(--global)
fi
# Prefer pre-built binary wheels to avoid building grpcio (and other C extensions)
# from source, which requires build tools like setuptools/pkg_resources that may
# not be available in isolated build environments.
pip_extra_args="--prefer-binary"
if [[ -n "${PIPX_PIP_ARGS}" ]]; then
pipx_flags+=(--pip-args "'${PIPX_PIP_ARGS}'")
pip_extra_args="${pip_extra_args} ${PIPX_PIP_ARGS}"
fi
pipx_flags+=(--pip-args "${pip_extra_args}")
${PIPX_BASE_PYTHON} -m pipx install ${pipx_flags[@]} \
"https://github.com/googleapis/storage-testbench/archive/${version}.tar.gz"
1 change: 1 addition & 0 deletions ci/scripts/msys2_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ case "${target}" in
packages+=(${MINGW_PACKAGE_PREFIX}-snappy)
packages+=(${MINGW_PACKAGE_PREFIX}-sqlite3)
packages+=(${MINGW_PACKAGE_PREFIX}-thrift)
packages+=(${MINGW_PACKAGE_PREFIX}-llvm)
packages+=(${MINGW_PACKAGE_PREFIX}-xsimd)
packages+=(${MINGW_PACKAGE_PREFIX}-uriparser)
packages+=(${MINGW_PACKAGE_PREFIX}-zstd)
Expand Down
26 changes: 12 additions & 14 deletions ci/vcpkg/overlay/brotli/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO google/brotli
REF "v${VERSION}"
SHA512 0b5c374417938eae11101995a373d30b1c91212e901e787b6e4b620195247ee754a3a4abda82793582be0b5fbe9dafca2da0b90e1341b3b91641c27cde6d42de1
HEAD_REF master
)
vcpkg_from_github(OUT_SOURCE_PATH
SOURCE_PATH
REPO
google/brotli
REF
"v${VERSION}"
SHA512
0b5c374417938eae11101995a373d30b1c91212e901e787b6e4b620195247ee754a3a4abda82793582be0b5fbe9dafca2da0b90e1341b3b91641c27cde6d42de1
HEAD_REF
master)

vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBROTLI_BUNDLED_MODE=ON
)
vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBROTLI_BUNDLED_MODE=ON)

vcpkg_cmake_install()

Expand All @@ -23,9 +22,8 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/brotli")
# Skip copying tools in debug builds - the brotli executable is not built in debug mode
# Only copy tools if VCPKG_BUILD_TYPE is not set to debug
if(NOT VCPKG_BUILD_TYPE STREQUAL "debug")
vcpkg_copy_tools(TOOL_NAMES brotli AUTO_CLEAN)
vcpkg_copy_tools(TOOL_NAMES brotli AUTO_CLEAN)
endif()

# Handle copyright
vcpkg_install_copyright("${SOURCE_PATH}/LICENSE")

Loading
Loading