From 5563168800784e12cbf9b19c112df8d1a5e321a4 Mon Sep 17 00:00:00 2001 From: dmitry Date: Tue, 14 Sep 2021 16:17:16 +0300 Subject: [PATCH] fix: msvc build build: switch to msvc. too much hassle with meson & windows cross-build --- .github/workflows/build.yml | 45 ++++++++++++++++++++++++++++++------- vc/yapb.vcxproj | 4 ++-- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1518daa..cb66ac7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: types: [published] jobs: - builds: + unix: strategy: matrix: include: @@ -20,10 +20,6 @@ jobs: bin: yapb.so opts: CXX=gcc-11 CXX_LD=gold meson setup build - - name: windows-x86 - bin: yapb.dll - opts: meson setup build --cross-file=x86-windows - - name: macos-x86 bin: yapb.dylib opts: meson setup build --cross-file=x86-darwin @@ -54,8 +50,41 @@ jobs: name: ${{ matrix.bin }} path: build/${{ matrix.bin }} - linux-aarch64: - name: linux-aarch64 + windows: + name: windows-x86 + runs-on: windows-latest + + steps: + - name: Checkout Repository + uses: actions/checkout@v2 + with: + fetch-depth: 0 + submodules: true + - name: Setup MSBuild + uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64_x86 + + - name: Setup Meson + run: | + python -m pip install --upgrade meson ninja + + - name: Configure Build + run: | + meson setup build + + - name: Compile Source + run: | + meson compile -v -C build + + - name: Upload Artifacts + uses: actions/upload-artifact@v2 + with: + name: yapb.dll + path: build/yapb.dll + + linux-arm64: + name: linux-arm64 runs-on: self-hosted continue-on-error: true @@ -88,7 +117,7 @@ jobs: name: publish runs-on: ubuntu-latest - needs: [builds] + needs: [unix, windows, linux-arm64] steps: - name: Checkout Repository diff --git a/vc/yapb.vcxproj b/vc/yapb.vcxproj index 8a1299b..cf55350 100644 --- a/vc/yapb.vcxproj +++ b/vc/yapb.vcxproj @@ -233,7 +233,7 @@ .\release\inf\ Level4 true - ProgramDatabase + None CompileAsCpp MultiFile true @@ -268,7 +268,7 @@ .\release\yapb.dll true user32.dll;ws2_32.dll;%(DelayLoadDLLs) - true + false false Windows true