immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add x86 MSVC build to GH Actions

fix-squashed-planets
MrSimbax 2020-07-14 21:07:01 +02:00
parent 73429315a7
commit 2fa706a123
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/build.yml vendored
View File

@ -87,6 +87,13 @@ jobs:
if: matrix.target_os == 'linux' if: matrix.target_os == 'linux'
build-windows: build-windows:
runs-on: windows-2019 runs-on: windows-2019
strategy:
matrix:
include:
- arch: amd64
vcpkg_triplet: 'x64-windows-static'
- arch: x86
vcpkg_triplet: 'x86-windows-static'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Checkout the Google Test submodule - name: Checkout the Google Test submodule
@ -95,11 +102,13 @@ jobs:
uses: seanmiddleditch/gha-setup-ninja@master uses: seanmiddleditch/gha-setup-ninja@master
- name: Setup VS Environment - name: Setup VS Environment
uses: seanmiddleditch/gha-setup-vsdevenv@master uses: seanmiddleditch/gha-setup-vsdevenv@master
with:
arch: ${{ matrix.arch }}
- name: Install Colobot dependencies - name: Install Colobot dependencies
uses: lukka/run-vcpkg@v3 uses: lukka/run-vcpkg@v3
with: with:
vcpkgGitCommitId: '006a133d39a72cc7ec60f651e224ca8a3b41c734' vcpkgGitCommitId: '006a133d39a72cc7ec60f651e224ca8a3b41c734'
vcpkgTriplet: 'x64-windows-static' vcpkgTriplet: ${{ matrix.vcpkg_triplet }}
vcpkgArguments: 'boost-system boost-filesystem boost-regex boost-lexical-cast boost-bimap boost-algorithm boost-property-tree boost-optional boost-range sdl2 sdl2-ttf sdl2-image glew libpng libwebp tiff gettext libsndfile libvorbis libogg openal-soft physfs' vcpkgArguments: 'boost-system boost-filesystem boost-regex boost-lexical-cast boost-bimap boost-algorithm boost-property-tree boost-optional boost-range sdl2 sdl2-ttf sdl2-image glew libpng libwebp tiff gettext libsndfile libvorbis libogg openal-soft physfs'
# SHA-256 hash of the list of packages above, for caching purposes # SHA-256 hash of the list of packages above, for caching purposes
appendedCacheKey: '35754367e6e6b4fb1b1ec24fa631e5234548fa1f9a59e4f2d80d2174a3a4e1b5' appendedCacheKey: '35754367e6e6b4fb1b1ec24fa631e5234548fa1f9a59e4f2d80d2174a3a4e1b5'
@ -131,7 +140,7 @@ jobs:
run: cmake -E make_directory build run: cmake -E make_directory build
- name: Run CMake (for Windows) - name: Run CMake (for Windows)
working-directory: build working-directory: build
run: cmake -G "Ninja" -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}\scripts\buildsystems\vcpkg.cmake -DUSE_STATIC_RUNTIME=1 -DCBOT_STATIC=1 -DBOOST_STATIC=1 -DGLEW_STATIC=1 -DSNDFILE_STATIC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}\build\install -DDEV_BUILD=1 -DPORTABLE=1 -DTOOLS=1 -DTESTS=1 -DDESKTOP=1 .. run: cmake -G "Ninja" -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }} -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}\scripts\buildsystems\vcpkg.cmake -DUSE_STATIC_RUNTIME=1 -DCBOT_STATIC=1 -DBOOST_STATIC=1 -DGLEW_STATIC=1 -DSNDFILE_STATIC=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}\build\install -DDEV_BUILD=1 -DPORTABLE=1 -DTOOLS=1 -DTESTS=1 -DDESKTOP=1 ..
- name: Build - name: Build
working-directory: build working-directory: build
run: | run: |
@ -144,7 +153,7 @@ jobs:
- name: Upload build - name: Upload build
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: windows-msvc-debug name: windows-msvc-debug-${{ matrix.arch }}
path: build/install path: build/install
- name: Run tests - name: Run tests
working-directory: build working-directory: build
@ -152,7 +161,7 @@ jobs:
- name: Upload test results - name: Upload test results
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: 'Test results (Windows, MSVC)' name: 'Test results (windows, MSVC, ${{ matrix.arch }})'
path: build/gtestresults.xml path: build/gtestresults.xml
doc: doc:
runs-on: ubuntu-latest runs-on: ubuntu-latest