diff options
| author | Joachim Wiberg <troglobit@gmail.com> | 2022-12-31 15:34:57 +0100 |
|---|---|---|
| committer | Joachim Wiberg <troglobit@gmail.com> | 2022-12-31 19:51:23 +0100 |
| commit | e1736306872dd264e802f501d0645fd78ba2a092 (patch) | |
| tree | 815c402e167833b1805e87fca1833015cc431dd6 | |
| parent | d7bd1781fe46f83b9b28835d3c1742b2ac13eccb (diff) | |
| download | libnet-e1736306872dd264e802f501d0645fd78ba2a092.tar.gz | |
.github: enable matrix bulder for 32/64-bit builds
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
| -rw-r--r-- | .github/workflows/build-windows.yml | 14 | ||||
| -rw-r--r-- | win32/msvcbuild.bat | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index ce2068e..6dbd844 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -6,6 +6,8 @@ jobs: windows-build: runs-on: windows-2019 strategy: + matrix: + arch: [x86, x86_64] fail-fast: false steps: - uses: actions/checkout@v3 @@ -14,16 +16,12 @@ jobs: run: | Invoke-WebRequest https://npcap.com/dist/npcap-sdk-1.13.zip -OutFile ../npcap-sdk.zip Expand-Archive ../npcap-sdk.zip -DestinationPath ../npcap-sdk - - name: Build 32-bit + - name: Build ${{ matrix.arch }} shell: cmd run: | - .\win32\msvcbuild.bat x86 - - name: Build 64-bit - shell: cmd - run: | - .\win32\msvcbuild.bat x86_64 + .\win32\msvcbuild.bat ${{ matrix.arch }} - name: Archive DLL files uses: actions/upload-artifact@v3 with: - name: libnet-${{ github.run_number }} - path: lib/* + name: libnet-${{ matrix.arch }}-build${{ github.run_number }} + path: lib/${{ matrix.arch }} diff --git a/win32/msvcbuild.bat b/win32/msvcbuild.bat index d41a7dc..76a5978 100644 --- a/win32/msvcbuild.bat +++ b/win32/msvcbuild.bat @@ -52,7 +52,7 @@ call "%InstallDir%\Common7\Tools\VsDevCmd.bat" -arch=amd64 set PCAPLIB=%NPCAP%\Lib\x64
set PCAPINC=%NPCAP%\Include
set OBJDIR=win64
-set LIBDIR=..\lib\x64
+set LIBDIR=..\lib\x86_64
goto msvcbuild
:msvcbuild
|