Skip to content

Commit aa1ce81

Browse files
authored
Update release.yml
1 parent 9c241e5 commit aa1ce81

1 file changed

Lines changed: 10 additions & 13 deletions

File tree

.github/workflows/release.yml

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,11 @@ jobs:
7575
- name: Install dependencies (macOS)
7676
if: runner.os == 'macOS'
7777
run: |
78-
brew install cmake ninja jsoncpp
79-
78+
brew install cmake ninja
79+
git clone https://github.com/Microsoft/vcpkg.git
80+
./vcpkg/bootstrap-vcpkg.sh
81+
./vcpkg/vcpkg install jsoncpp
82+
8083
- name: Install dependencies (Windows)
8184
if: runner.os == 'Windows'
8285
run: |
@@ -104,22 +107,16 @@ jobs:
104107
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
105108
EOF
106109
107-
- name: Configure CMake (Windows)
108-
if: runner.os == 'Windows'
109-
shell: cmd
110+
- name: Configure CMake
111+
if: runner.os != 'macOS'
110112
run: |
111-
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows ${{ matrix.cmake_args }}
112-
113-
- name: Configure CMake (Linux)
114-
if: runner.os == 'Linux'
115-
run: |
116-
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }}
113+
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
117114
118115
- name: Configure CMake (macOS)
119116
if: runner.os == 'macOS'
120117
run: |
121-
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }}
122-
118+
cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake
119+
123120
- name: Build release binary
124121
run: cmake --build build --config Release
125122

0 commit comments

Comments
 (0)