Skip to content
Merged
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
4 changes: 1 addition & 3 deletions .kokoro/presubmit/linux/presubmit-linux.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ action {
regex: "**/*sponge_log.xml"
}
}

# Bypass the trampoline entirely and run our dummy script natively
build_file: "google-cloud-python/packages/google-crc32c/scripts/bypass.sh"
build_file: "google-cloud-python/packages/google-crc32c/scripts/manylinux/build.sh"
3 changes: 1 addition & 2 deletions .kokoro/presubmit/osx/presubmit-osx-slcn.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ action {
}
}

# Reuse the exact same bash script we used for Linux!
build_file: "google-cloud-python/packages/google-crc32c/scripts/bypass.sh"
build_file: "google-cloud-python/packages/google-crc32c/scripts/osx/build.sh"
3 changes: 1 addition & 2 deletions .kokoro/presubmit/osx/presubmit-osx.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ action {
}
}

# Reuse the exact same bash script we used for Linux!
build_file: "google-cloud-python/packages/google-crc32c/scripts/bypass.sh"
build_file: "google-cloud-python/packages/google-crc32c/scripts/osx/build.sh"
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ action {
}
}

# Reuse the exact same bash script we used for Linux!
build_file: "google-cloud-python/packages/google-crc32c/scripts/bypass.bat"
build_file: "google-cloud-python/packages/google-crc32c/scripts/windows/build.bat"
7 changes: 0 additions & 7 deletions packages/google-crc32c/scripts/bypass.bat

This file was deleted.

11 changes: 0 additions & 11 deletions packages/google-crc32c/scripts/bypass.sh

This file was deleted.

3 changes: 1 addition & 2 deletions packages/google-crc32c/scripts/manylinux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ sudo apt-get install -y python3.12

cd $REPO_ROOT
# Add directory as safe to avoid "detected dubious ownership" fatal issue1
git config --global --add safe.directory $REPO_ROOT
git config --global --add safe.directory $REPO_ROOT/google_crc32c
git config --global --add safe.directory '*'
git submodule update --init --recursive


Expand Down
3 changes: 1 addition & 2 deletions packages/google-crc32c/scripts/osx/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ export CRC32C_INSTALL_PREFIX="${REPO_ROOT}/usr"

cd ${REPO_ROOT}
# Add directory as safe to avoid "detected dubious ownership" fatal issue
git config --global --add safe.directory $REPO_ROOT
git config --global --add safe.directory $REPO_ROOT/google_crc32c
git config --global --add safe.directory '*'
git submodule update --init --recursive

${OSX_DIR}/build_c_lib.sh
Expand Down
8 changes: 2 additions & 6 deletions packages/google-crc32c/scripts/osx/build_python_wheel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,8 @@ install_python_pyenv() {
install_python_pyenv ${PY_BIN}


# ``readlink -f`` is not our friend on OS X. This relies on **some**
# ``python`` being installed.
SCRIPT_FI=$(python3 -c "import os; print(os.path.realpath('${0}'))")
OSX_DIR=$(dirname ${SCRIPT_FI})
SCRIPTS_DIR=$(dirname ${OSX_DIR})
export REPO_ROOT=$(dirname ${SCRIPTS_DIR})
# Rely on the REPO_ROOT already provided by the parent script
OSX_DIR="${REPO_ROOT}/scripts/osx"

# Create a virtualenv where we can install Python build dependencies.
VENV=${REPO_ROOT}/venv${PY_BIN}
Expand Down
8 changes: 2 additions & 6 deletions packages/google-crc32c/scripts/windows/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,8 @@ FOR %%P IN (3.9, 3.10, 3.11, 3.12, 3.13.1, 3.14.0) DO (
py -!python_version_trimmed!-64 -m pip install cmake

@rem Add directory as safe to avoid "detected dubious ownership" fatal issue
git config --global --add safe.directory %cd%
git config --global --add safe.directory C:/tmpfs/src/github/python-crc32c
git config --global --add safe.directory *
git submodule update --init --recursive

git config --global --add safe.directory %cd%\google_crc32c
git config --global --add safe.directory C:/tmpfs/src/github/python-crc32c/google_crc32c
pushd google_crc32c
@rem reset hard to cleanup any changes done by a previous build.
git reset --hard
Expand All @@ -59,7 +55,7 @@ FOR %%P IN (3.9, 3.10, 3.11, 3.12, 3.13.1, 3.14.0) DO (

echo "Running cmake with Generator: %CMAKE_GENERATOR%, Platform: x64, Install Prefix: %CRC32C_INSTALL_PREFIX%"

py -!python_version_trimmed!-64 -m cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_VERSION_MINIMUM=3.12 -DCRC32C_BUILD_BENCHMARKS=no -DCRC32C_BUILD_TESTS=no -DBUILD_SHARED_LIBS=yes -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=yes -DCRC32C_USE_GLOG=0 -DCMAKE_INSTALL_PREFIX:PATH=C:\tmpfs\src\github\python-crc32c\build\RelWithDebInfo ..
py -!python_version_trimmed!-64 -m cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_POLICY_VERSION_MINIMUM=3.12 -DCRC32C_BUILD_BENCHMARKS=no -DCRC32C_BUILD_TESTS=no -DBUILD_SHARED_LIBS=yes -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=yes -DCRC32C_USE_GLOG=0 -DCMAKE_INSTALL_PREFIX:PATH="%CRC32C_INSTALL_PREFIX%" ..

py -!python_version_trimmed!-64 -m cmake --build . --config "%CONFIGURATION%" --target install

Expand Down
Loading