From 32867d1bbf0557192ab5a780baa0b23f57ae2698 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Mon, 20 Dec 2021 21:15:24 -0500 Subject: [PATCH] Update pull-requests_build-check.yml -Try Windows build with Unix Makefiles --- .../workflows/pull-requests_build-check.yml | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/.github/workflows/pull-requests_build-check.yml b/.github/workflows/pull-requests_build-check.yml index b1613413..ca99ae20 100644 --- a/.github/workflows/pull-requests_build-check.yml +++ b/.github/workflows/pull-requests_build-check.yml @@ -130,36 +130,44 @@ jobs: with: submodules: recursive - - name: Install boost - #uses: MarkusJx/install-boost@v2.0.0 - uses: MarkusJx/install-boost@boost-mingw - id: install-boost - with: - # REQUIRED: Specify the required boost version - # A list of supported versions can be found here: - # https://github.com/actions/boost-versions/blob/main/versions-manifest.json - boost_version: 1.78.0 - # OPTIONAL: Specify a custom install location - boost_install_dir: 'C:' - # OPTIONAL: Specify a platform version - platform_version: 2019 - toolset: mingw - - # NOTE: If a boost version matching all requirements cannot be found, - # this build step will fail +# - name: Install boost +# #uses: MarkusJx/install-boost@v2.0.0 +# uses: MarkusJx/install-boost@boost-mingw +# id: install-boost +# with: +# # REQUIRED: Specify the required boost version +# # A list of supported versions can be found here: +# # https://github.com/actions/boost-versions/blob/main/versions-manifest.json +# boost_version: 1.78.0 +# # OPTIONAL: Specify a custom install location +# boost_install_dir: 'C:' +# # OPTIONAL: Specify a platform version +# platform_version: 2019 +# toolset: mingw +# +# # NOTE: If a boost version matching all requirements cannot be found, +# # this build step will fail - name: Setup Windows run: | C:\msys64\usr\bin\bash -lc "pacman --needed --noconfirm -S mingw-w64-x86_64-binutils mingw-w64-x86_64-openssl mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-opus mingw-w64-x86_64-x265 mingw-w64-x86_64-boost git yasm nasm diffutils make" +# - name: Build Windows +# env: +# BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} +# run: | +# mkdir sunshine-windows-build && cd sunshine-windows-build +# set PATH=C:\msys64\mingw64\bin +# set BOOST_ROOT=C:\boost +# set BOOST_INCLUDEDIR=C:\boost +# set BOOST_LIBRARYDIR=C:\boost\lib +# cmake -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. +# mingw32-make -j2 - name: Build Windows env: BOOST_ROOT: ${{ steps.install-boost.outputs.BOOST_ROOT }} run: | mkdir sunshine-windows-build && cd sunshine-windows-build set PATH=C:\msys64\mingw64\bin - set BOOST_ROOT=C:\boost - set BOOST_INCLUDEDIR=C:\boost - set BOOST_LIBRARYDIR=C:\boost\lib - cmake -DCMAKE_CXX_STANDARD=17 -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "MinGW Makefiles" .. + cmake -DCMAKE_BUILD_TYPE=Release -DSUNSHINE_ASSETS_DIR=assets -G "Unix Makefiles" .. mingw32-make -j2 - name: Package Windows run: |