Skip to content

Commit 9c241e5

Browse files
authored
Update ci.yml
1 parent 322db5a commit 9c241e5

1 file changed

Lines changed: 10 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,29 +41,27 @@ jobs:
4141
- name: Install dependencies (macOS)
4242
if: runner.os == 'macOS'
4343
run: |
44-
brew install cmake ninja jsoncpp
45-
44+
brew install cmake ninja
45+
git clone https://github.com/Microsoft/vcpkg.git
46+
./vcpkg/bootstrap-vcpkg.sh
47+
./vcpkg/vcpkg install jsoncpp
48+
4649
- name: Install dependencies (Windows)
4750
if: runner.os == 'Windows'
4851
run: |
4952
choco install cmake ninja
5053
vcpkg install jsoncpp gtest
5154
52-
- name: Configure CMake (Linux)
53-
if: runner.os == 'Linux'
55+
- name: Configure CMake
56+
if: runner.os != 'macOS'
5457
run: |
55-
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }}
58+
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
5659
5760
- name: Configure CMake (macOS)
5861
if: runner.os == 'macOS'
5962
run: |
60-
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }}
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
66-
63+
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake
64+
6765
- name: Build
6866
run: cmake --build build --config ${{ matrix.build_type }}
6967

0 commit comments

Comments
 (0)