From 5155e20681080e8ea3b0f59777b2d756f2d1e899 Mon Sep 17 00:00:00 2001 From: John Wason Date: Thu, 18 Jan 2024 18:52:08 -0500 Subject: [PATCH] Update to vcpkg-action@v6 and use vcpkg-binarycache --- .github/workflows/mac.yml | 3 ++- .github/workflows/windows.yml | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 151128c67c1..4a15285c8c3 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -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 }} @@ -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 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 40b9275cb6d..0fe181497d1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,15 +27,14 @@ jobs: path: target_ws/src - name: vcpkg build - uses: johnwason/vcpkg-action@v5 + 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-filesystem boost-serialization boost-program-options boost-graph urdfdom ccd[double-precision] gtest 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 with: