Skip to content

Commit 23cbc4e

Browse files
committed
.github: install some build deps for Win CI, remove useless runs
1 parent b686f37 commit 23cbc4e

1 file changed

Lines changed: 12 additions & 2 deletions

File tree

.github/workflows/ci.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,17 @@ jobs:
1818
include:
1919
- os: macos-latest
2020
macos_cmake_options: "-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl" # set this extra var for OSX
21+
- os: windows-latest
22+
windows_cmake_options: "-DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" # set this extra var for Windows
2123
exclude:
2224
- os: macos-latest
2325
cmake_options: "-DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-mingw32-linux.cmake" # don't test MinGW from OSX
2426
- os: windows-latest
25-
cmake_options: "-DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-mingw32-linux.cmake" # don't test MinGW from OSX
27+
cmake_options: "-DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-mingw32-linux.cmake" # don't test MinGW from Windows
28+
- os: windows-latest
29+
cmake_options: "-DWITH_OPENSSL=ON -DWITH_GNUTLS=OFF -DWITH_GCRYPT=OFF" # don't have OpenSSL on Windows (yet)
30+
- os: windows-latest
31+
cmake_options: "-DWITH_OPENSSL=OFF -DWITH_GNUTLS=ON -DWITH_GCRYPT=ON" # don't have GnuTLS and libgcrypt on Windows (yet)
2632
runs-on: ${{ matrix.os }}
2733
steps:
2834
- uses: actions/checkout@v3
@@ -36,11 +42,15 @@ jobs:
3642
run: |
3743
brew update
3844
brew install sdl2 lzo
45+
- name: Install Windows Build Dependencies
46+
if: ${{ matrix.os == 'windows-latest' }}
47+
run: |
48+
vcpkg install zlib libjpeg-turbo libpng --triplet=x64-windows # could install more but should use run-vcpkg with caching for this
3949
- name: Build
4050
run: |
4151
mkdir build
4252
cd build
43-
cmake ${{ matrix.cmake_options }} ${{ matrix.macos_cmake_options }} ..
53+
cmake ${{ matrix.cmake_options }} ${{ matrix.macos_cmake_options }} ${{ matrix.windows_cmake_options }} ..
4454
cmake --build .
4555
- name: Prepare Test
4656
if: ${{ matrix.os == 'ubuntu-latest' }} # only ubuntu does crosscompile with MinGW toolchain

0 commit comments

Comments
 (0)