mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-11 05:47:48 -04:00
don't use ilammy/msvc-dev-cmd
Windows-2022 image now contains two installations of vcpkg, see: https://github.com/microsoft/vcpkg/issues/31808 Don't use Visual Studio version, switch to MSBuild.
This commit is contained in:
parent
68b6c34c59
commit
31b1e31bbf
25
.github/workflows/win_msvc.yml
vendored
25
.github/workflows/win_msvc.yml
vendored
@ -17,12 +17,20 @@ env:
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
if: ${{ github.repository == 'fabiangreffrath/woof' }}
|
if: ${{ github.repository == 'fabiangreffrath/woof' }}
|
||||||
name: MSVC ${{ matrix.arch }}
|
name: MSVC ${{ matrix.config.arch }}
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch: [x64, x86]
|
config:
|
||||||
|
- {
|
||||||
|
name: x64,
|
||||||
|
arch: x64,
|
||||||
|
}
|
||||||
|
- {
|
||||||
|
name: Win32,
|
||||||
|
arch: x86,
|
||||||
|
}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v3
|
||||||
@ -48,22 +56,17 @@ jobs:
|
|||||||
"$NUGET" setapikey "${{ secrets.GITHUB_TOKEN }}" \
|
"$NUGET" setapikey "${{ secrets.GITHUB_TOKEN }}" \
|
||||||
-source "$GH_PACKAGES_URL"
|
-source "$GH_PACKAGES_URL"
|
||||||
|
|
||||||
- name: Setup devcmd
|
|
||||||
uses: ilammy/msvc-dev-cmd@v1
|
|
||||||
with:
|
|
||||||
arch: ${{ matrix.arch }}
|
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
cmake -B build -G Ninja `
|
cmake -B build -A ${{ matrix.config.name }} `
|
||||||
-DCMAKE_BUILD_TYPE=Release -DENABLE_WERROR=ON -DENABLE_LTO=ON `
|
-DCMAKE_BUILD_TYPE=Release -DENABLE_WERROR=ON -DENABLE_LTO=ON `
|
||||||
-DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
|
-DCMAKE_TOOLCHAIN_FILE="${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
|
||||||
-DVCPKG_TARGET_TRIPLET="${{ matrix.arch }}-windows-static-release" `
|
-DVCPKG_TARGET_TRIPLET="${{ matrix.config.arch }}-windows-static-release" `
|
||||||
-DVCPKG_OVERLAY_TRIPLETS="cmake/triplets" `
|
-DVCPKG_OVERLAY_TRIPLETS="cmake/triplets" `
|
||||||
-DCMAKE_IGNORE_PATH="C:/Strawberry/perl/bin;C:/Strawberry/c/lib"
|
-DCMAKE_IGNORE_PATH="C:/Strawberry/perl/bin;C:/Strawberry/c/lib"
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: cmake --build build
|
run: cmake --build build --config "Release"
|
||||||
|
|
||||||
- name: Package
|
- name: Package
|
||||||
run: |
|
run: |
|
||||||
@ -73,7 +76,7 @@ jobs:
|
|||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: Win-${{ matrix.arch }}
|
name: Win-${{ matrix.config.arch }}
|
||||||
path: build/*.zip
|
path: build/*.zip
|
||||||
|
|
||||||
- name: Extract Version Number
|
- name: Extract Version Number
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||||
"builtin-baseline": "662dbb50e63af15baa2909b7eac5b1b87e86a0aa",
|
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"sdl2",
|
"sdl2",
|
||||||
"sdl2-net",
|
"sdl2-net",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user