summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorLoneWolfHT <lonewolf04361@gmail.com>2022-05-04 14:55:02 -0700
committerGitHub <noreply@github.com>2022-05-04 22:55:02 +0100
commit47cf257c4098f087d4dc46ac28ddb39141222b0c (patch)
tree5bfcd4591400b957825dec7513cca7abe8fa1546 /.github
parentcc56ebd90db3858313a9e597a89c5db8fec3b617 (diff)
downloadminetest-47cf257c4098f087d4dc46ac28ddb39141222b0c.tar.gz
minetest-47cf257c4098f087d4dc46ac28ddb39141222b0c.tar.bz2
minetest-47cf257c4098f087d4dc46ac28ddb39141222b0c.zip
Fix Windows Visual Studio actions (#11176)
Co-authored-by: rubenwardy <rw@rubenwardy.com>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/build.yml24
1 files changed, 14 insertions, 10 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 78027d09c..61b9833be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -199,13 +199,10 @@ jobs:
msvc:
name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}
runs-on: windows-2019
- #### Disabled due to Irrlicht switch
- if: false
- #### Disabled due to Irrlicht switch
env:
- VCPKG_VERSION: 0bf3923f9fab4001c00f0f429682a0853b5749e0
-# 2020.11
- vcpkg_packages: irrlicht zlib zstd curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit
+ VCPKG_VERSION: 5cf60186a241e84e8232641ee973395d4fde90e1
+ # 2022.02
+ vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry
strategy:
fail-fast: false
matrix:
@@ -227,10 +224,17 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
+
+ - name: Checkout IrrlichtMT
+ uses: actions/checkout@v3
+ with:
+ repository: minetest/irrlicht
+ path: lib/irrlichtmt/
+ ref: "1.9.0mt4"
- name: Restore from cache and run vcpkg
- uses: lukka/run-vcpkg@v5
+ uses: lukka/run-vcpkg@v7
with:
vcpkgArguments: ${{env.vcpkg_packages}}
vcpkgDirectory: '${{ github.workspace }}\vcpkg'
@@ -238,7 +242,7 @@ jobs:
vcpkgGitCommitId: ${{ env.VCPKG_VERSION }}
vcpkgTriplet: ${{ matrix.config.vcpkg_triplet }}
- - name: CMake
+ - name: Minetest CMake
run: |
cmake ${{matrix.config.generator}} `
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" `
@@ -246,7 +250,7 @@ jobs:
-DENABLE_POSTGRESQL=OFF `
-DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} .
- - name: Build
+ - name: Build Minetest
run: cmake --build . --config Release
- name: CPack