Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup #30

Merged
merged 2 commits into from
Oct 13, 2020
Merged

Cleanup #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4e3831
Remove references to the need to specify overlay-ports
traversaro Oct 12, 2020
a32cfe0
Remove ACE workaround: As the ace failure in vcpkg was fixed (see htt…
traversaro Oct 12, 2020
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
9 changes: 2 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,8 @@ jobs:
choco install -y wget
mkdir C:/robotology
cd C:/robotology
# Download a custom vcpkg 2019.10 that already contains ace pre-compiled, as a workaround for https://github.com/actions/virtual-environments/issues/605
wget https://github.com/robotology/robotology-vcpkg-binary-ports/releases/download/storage/robotology-vcpkg-2019.10-ace.zip
7z x robotology-vcpkg-2019.10-ace.zip
rm robotology-vcpkg-2019.10-ace.zip
cd C:/robotology/vcpkg
# Update vcpkg to a newer commit
git fetch
git clone https://github.com/Microsoft/vcpkg
cd vcpkg
git checkout 76a7e9248fb3c57350b559966dcaa2d52a5e4458
C:/robotology/vcpkg/bootstrap-vcpkg.sh
git clone https://github.com/robotology/robotology-vcpkg-ports C:/robotology/robotology-vcpkg-ports
Expand Down
8 changes: 0 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,6 @@ As Gazebo on Windows does not provide the single `gazebo` executable available i
### Install or remove vcpkg ports
You can install or remove ports from the vcpkg installation in `C:/robotology/vcpkg` as you do for any other vcpkg installation.

However, as this vcpkg installation contains some ports installed from the custom port repo contained in `C:/robotology/vcpkg`,
due to a regression in vcpkg (see https://github.com/microsoft/vcpkg/issues/10119) you need to pass the `--overlay-ports=C:/robotology/robotology-vcpkg-binary-ports` argument whenever you use vcpkg.

For example, to install a new port called `<portname>` the correct command is:
~~~
./vcpkg.exe install --overlay-ports=C:/robotology/robotology-vcpkg-binary-ports <portname>:x64-windows
~~~

### GitHub Actions
To use the script in a GitHub Action script, you can use the following snippet:
~~~~
Expand Down