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

Update to vcpkg-action@v6 and use vcpkg-binarycache #434

Merged
merged 9 commits into from
Mar 12, 2024
Merged

Update to vcpkg-action@v6 and use vcpkg-binarycache #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dcd1552
Update to vcpkg-action@v6 and use vcpkg-binarycache
johnwason Jan 18, 2024
b93e85b
Use vcpkg revision 2023.08.09 for windows action
johnwason Jan 29, 2024
7e37af9
Merge branch 'master' into vcpkg-action_v6
Levi-Armstrong Feb 17, 2024
98f32a8
Merge branch 'master' into vcpkg-action_v6
Levi-Armstrong Feb 22, 2024
922271b
Merge branch 'master' into vcpkg-action_v6
Levi-Armstrong Feb 23, 2024
98f6ee7
Merge branch 'master' into vcpkg-action_v6
Levi-Armstrong Mar 8, 2024
27642db
Include boost-format vcpkg package on mac
johnwason Mar 8, 2024
3e13f2a
Use most recent version of vcpkg on windows
johnwason Mar 8, 2024
13c109f
Include boost-format vcpkg package on windows
johnwason Mar 9, 2024
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
5 changes: 3 additions & 2 deletions .github/workflows/mac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
env:
VCPKG_PKGS: >-
boost-dll boost-program-options
boost-serialization boost-filesystem
boost-serialization boost-filesystem boost-format
tinyxml2 console-bridge assimp
urdfdom octomap orocos-kdl pcl
gtest benchmark flann jsoncpp
Expand All @@ -44,7 +44,7 @@ jobs:
run: |
brew install libomp cmake automake autoconf libtool gcc ninja
- name: vcpkg build
uses: johnwason/vcpkg-action@v5
uses: johnwason/vcpkg-action@v6
with:
pkgs: >-
${{ env.VCPKG_PKGS }}
Expand All @@ -53,6 +53,7 @@ jobs:
token: ${{ github.token }}
cache-key: osx-x64-vcpkg
revision: master
github-binarycache: true
- name: pip3
run: |
python3 -m pip install numpy setuptools wheel pytest delvewheel colcon-common-extensions vcstool
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ jobs:
path: target_ws/src

- name: vcpkg build
uses: johnwason/vcpkg-action@v4
uses: johnwason/vcpkg-action@v6
with:
pkgs: >-
fcl bullet3[multithreading,double-precision,rtti] octomap
console-bridge eigen3 yaml-cpp benchmark tinyxml2 assimp orocos-kdl pcl
lapack-reference boost-dll boost-filesystem boost-serialization
lapack-reference boost-dll boost-filesystem boost-serialization boost-format
boost-program-options boost-graph urdfdom ccd[double-precision] gtest
ompl taskflow jsoncpp flann benchmark
triplet: x64-windows-release
extra-args: --clean-after-build
token: ${{ github.token }}
cache-key: ci-${{ matrix.os }}
revision: 2023.08.09
github-binarycache: true

- name: configure-msvc
uses: ilammy/msvc-dev-cmd@v1
Expand Down
Loading