Skip to content

Commit e9cabdb

Browse files
committed
Switch to lukka/run-vcpkg and update CMake toolchain path
1 parent 9f6aae7 commit e9cabdb

1 file changed

Lines changed: 18 additions & 19 deletions

File tree

.github/workflows/ci.yml

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,17 @@ jobs:
1818
- name: Checkout
1919
uses: actions/checkout@v4
2020

21-
- name: Setup vcpkg (manifest mode with cache)
22-
uses: microsoft/vcpkg-action@v1
21+
- name: Setup vcpkg
22+
uses: lukka/run-vcpkg@v11
2323
with:
24-
# Enable cache to speed up dependency restore between runs
25-
cache: true
24+
vcpkgGitCommitId: 'c59b04f668d20c7dd83f478835e8266a3cc51270'
2625

2726
- name: Configure CMake (VS 2022, x64, Debug)
2827
run: >
2928
cmake -S . -B build
3029
-G "Visual Studio 17 2022" -A x64
3130
-DENTROPY_ENABLE_TESTS=ON
32-
-DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}\\scripts\\buildsystems\\vcpkg.cmake"
31+
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
3332
3433
- name: Build tests (Debug)
3534
run: cmake --build build --config Debug --target EntropyCoreTests
@@ -69,16 +68,16 @@ jobs:
6968
sudo apt-get update
7069
sudo apt-get install -y ninja-build g++ cmake
7170
72-
- name: Setup vcpkg (manifest mode with cache)
73-
uses: microsoft/vcpkg-action@v1
71+
- name: Setup vcpkg
72+
uses: lukka/run-vcpkg@v11
7473
with:
75-
cache: true
74+
vcpkgGitCommitId: 'c59b04f668d20c7dd83f478835e8266a3cc51270'
7675

7776
- name: Configure CMake (Ninja, Debug)
7877
run: >
7978
cmake -S . -B build -G Ninja
8079
-DENTROPY_ENABLE_TESTS=ON
81-
-DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake"
80+
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
8281
8382
- name: Build tests
8483
run: cmake --build build --target EntropyCoreTests
@@ -118,19 +117,19 @@ jobs:
118117
sudo apt-get update
119118
sudo apt-get install -y ninja-build clang-18 lld-18 cmake
120119
121-
- name: Setup vcpkg (manifest mode with cache)
122-
uses: microsoft/vcpkg-action@v1
120+
- name: Setup vcpkg
121+
uses: lukka/run-vcpkg@v11
123122
with:
124-
cache: true
123+
vcpkgGitCommitId: 'c59b04f668d20c7dd83f478835e8266a3cc51270'
125124

126125
- name: Configure CMake (Ninja, Debug, Clang 18)
127126
env:
128127
CC: clang-18
129128
CXX: clang++-18
130129
run: >
131-
cmake -S . -B build -G Ninja \
132-
-DENTROPY_ENABLE_TESTS=ON \
133-
-DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake"
130+
cmake -S . -B build -G Ninja
131+
-DENTROPY_ENABLE_TESTS=ON
132+
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
134133
135134
- name: Build tests
136135
run: cmake --build build --target EntropyCoreTests
@@ -170,17 +169,17 @@ jobs:
170169
brew update
171170
brew install ninja
172171
173-
- name: Setup vcpkg (manifest mode with cache)
174-
uses: microsoft/vcpkg-action@v1
172+
- name: Setup vcpkg
173+
uses: lukka/run-vcpkg@v11
175174
with:
176-
cache: true
175+
vcpkgGitCommitId: 'c59b04f668d20c7dd83f478835e8266a3cc51270'
177176

178177
- name: Configure CMake (Ninja, Debug, Universal)
179178
run: >
180179
cmake -S . -B build -G Ninja
181180
-DENTROPY_ENABLE_TESTS=ON
182181
-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
183-
-DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake"
182+
-DCMAKE_TOOLCHAIN_FILE=${{ github.workspace }}/vcpkg/scripts/buildsystems/vcpkg.cmake
184183
185184
- name: Build tests
186185
run: cmake --build build --target EntropyCoreTests

0 commit comments

Comments
 (0)