Skip to content

Commit

Permalink
BLD: Add Windows system path to delvewheel add-path
Browse files Browse the repository at this point in the history
adang1345/delvewheel#54

Additionally, vcpkg has a download error when running with a bash shell
so we need to add some extra exports as a workaround.
microsoft/vcpkg#41199 (comment)
  • Loading branch information
greglucas committed Sep 29, 2024
1 parent 735a902 commit e876b19
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ jobs:
VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
shell: bash
run: |
# Workaround for vcpkg downloading issue:
# https://github.com/microsoft/vcpkg/issues/41199#issuecomment-2378255699
export SystemDrive="$SYSTEMDRIVE"
export SystemRoot="$SYSTEMROOT"
export windir="$WINDIR"
cd "$VCPKG_INSTALLATION_ROOT"
git pull > nul
./bootstrap-vcpkg.bat -disableMetrics
Expand Down Expand Up @@ -143,7 +148,8 @@ jobs:
PROJ_VERSION=${{ env.PROJ_VERSION }}
PROJ_DIR=$VCPKG_INSTALLATION_ROOT/installed/${{ matrix.triplet }}
CIBW_BEFORE_BUILD_WINDOWS: "python -m pip install delvewheel"
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path C:/vcpkg/installed/${{ matrix.triplet }}/bin -w {dest_dir} {wheel}"
# Add Windows System32 explicitly to the path https://github.com/adang1345/delvewheel/issues/54
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path C:/Windows/System32 --add-path C:/vcpkg/installed/${{ matrix.triplet }}/bin -w {dest_dir} {wheel}"
CIBW_BEFORE_ALL_LINUX: bash ./ci/proj-compile-wheels.sh
CIBW_BEFORE_ALL_MACOS: bash ./ci/proj-compile-wheels.sh
CIBW_TEST_REQUIRES: cython pytest numpy --config-settings=setup-args="-Dallow-noblas=true"
Expand Down

0 comments on commit e876b19

Please sign in to comment.