Skip to content

Commit

Permalink
Merge pull request #474 from Xiangyu-Hu/ci/update-vcpkg
Browse files Browse the repository at this point in the history
Update vcpkg version
  • Loading branch information
Xiangyu-Hu authored Nov 21, 2023
2 parents d85a5e6 + 37d6f1b commit c2c30ec
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
workflow_dispatch:

env:
VCPKG_VERSION: "1c5a340f6e10985e2d92af174a68dbd15c1fa4e1" # 29/05/2023 commit at https://github.com/microsoft/vcpkg/pull/29067
VCPKG_VERSION: "2023.10.19"
CTEST_PARALLEL_LEVEL: "1"

# A workflow is made up of one or more jobs that can run sequentially or in parallel
Expand Down Expand Up @@ -412,9 +412,7 @@ jobs:
pkg-config `# for installing libraries with vcpkg`\
git \
cmake \
ninja \
zip \
unzip
ninja
- uses: hendrikmuhs/[email protected]
with:
Expand All @@ -427,16 +425,15 @@ jobs:

- name: Install dependencies
run: |
${{github.workspace}}/vcpkg/vcpkg install --clean-after-build --allow-unsupported \
${{github.workspace}}/vcpkg/vcpkg install --clean-after-build \
eigen3 \
tbb \
boost-program-options \
boost-geometry \
gtest \
simbody \
xsimd \
pybind11 \
opencascade
pybind11
- name: Generate buildsystem
run: |
Expand All @@ -445,7 +442,6 @@ jobs:
-D CMAKE_BUILD_TYPE=Release \
-D CMAKE_TOOLCHAIN_FILE="${{github.workspace}}/vcpkg/scripts/buildsystems/vcpkg.cmake" \
-D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache \
-D SPHINXSYS_CI=ON \
-D TEST_STATE_RECORDING=OFF \
-S ${{github.workspace}} \
-B ${{github.workspace}}/build
Expand Down Expand Up @@ -504,8 +500,7 @@ jobs:
gtest \
simbody \
xsimd \
pybind11 \
opencascade
pybind11
- uses: actions/download-artifact@v3
with:
Expand Down

0 comments on commit c2c30ec

Please sign in to comment.