Skip to content

Commit b30b680

Browse files
Use the shipped script to fix relocated windows binaries (#612)
1 parent b2d0037 commit b30b680

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

.github/workflows/reusable-ros-tooling-win-build.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -159,23 +159,20 @@ jobs:
159159
path: pixi.lock
160160

161161
- name: Install ROS
162-
# Download and extract ROS 2 package
162+
# Download and extract ROS 2 package and patch paths, see
163163
# https://docs.ros.org/en/rolling/Installation/Windows-Install-Binary.html
164+
# Note: We don't use the shipped pixi.toml file, we generated our own above
164165
run: |
165-
# TODO(christophfroehlich) remove with fix below
166166
Invoke-Expression ((& pixi shell-hook -s powershell) -join "`n")
167167
168-
mkdir -p ${{ env.ros_underlay_path }}
168+
New-Item -ItemType Directory -Force -Path ${{ env.ros_underlay_path }}
169169
Set-Location -Path ${{ env.ros_underlay_path }}
170170
$url = "https://github.com/ros2/ros2/releases/download/release-rolling-nightlies/ros2-rolling-nightly-windows-amd64.zip"
171171
$output = "ros2-package-windows-AMD64.zip"
172172
Invoke-WebRequest -Uri $url -OutFile $output
173173
Expand-Archive -Path $output -DestinationPath ros2_${{ inputs.ros_distro }}
174-
175-
# python packages are broken: https://github.com/ros2/ros2/issues/1675
176-
# TODO(christophfroehlich) remove once https://github.com/ros2/ci/pull/817 is released
177-
cd ros2_${{ inputs.ros_distro }}
178-
irm https://gist.githubusercontent.com/knmcguire/fd5326de442289712539182f6257191c/raw/bcb4bf2a460af3a1d71bcfcdcefa065ebd5060d7/preinstall_setup_windows.py -OutFile preinstall_setup_windows.py
174+
Remove-Item $output
175+
Set-Location -Path ros2_${{ inputs.ros_distro }}\ros2-windows
179176
python preinstall_setup_windows.py
180177
181178
- name: Get package list

0 commit comments

Comments
 (0)