Skip to content

Commit fe141a3

Browse files
authored
Update ci.yml
1 parent c627e21 commit fe141a3

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,26 +41,28 @@ jobs:
4141
- name: Install dependencies (macOS)
4242
if: runner.os == 'macOS'
4343
run: |
44-
brew install cmake ninja
45-
git clone https://github.com/Microsoft/vcpkg.git
46-
./vcpkg/bootstrap-vcpkg.sh
47-
./vcpkg/vcpkg install jsoncpp
44+
brew install cmake ninja jsoncpp
4845
4946
- name: Install dependencies (Windows)
5047
if: runner.os == 'Windows'
5148
run: |
5249
choco install cmake ninja
5350
vcpkg install jsoncpp gtest
5451
55-
- name: Configure CMake
56-
if: runner.os != 'macOS'
52+
- name: Configure CMake (Linux)
53+
if: runner.os == 'Linux'
5754
run: |
5855
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
5956
6057
- name: Configure CMake (macOS)
6158
if: runner.os == 'macOS'
6259
run: |
63-
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake ${{ matrix.cmake_args }}
60+
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
61+
62+
- name: Configure CMake (Windows)
63+
if: runner.os == 'Windows'
64+
run: |
65+
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
6466
6567
- name: Build
6668
run: cmake --build build --config ${{ matrix.build_type }}

0 commit comments

Comments
 (0)