Skip to content

Commit d407e04

Browse files
committed
Cirrus CI: some Windows tweaks.
Move env: before install_script:, as it should affect both. Add MSYSTEM: MINGW64, so that we do a MinGW64 build rather than an MSYS build, as we're building native Windows software. Do some directory searches to see what binaries come with Git and where uname came from (not from MSYS2, as we weren't installing it when we first tested it). Try using a Windows path to build_matrix.sh.
1 parent ff530de commit d407e04

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

.cirrus.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,18 @@ windows_task:
6666
only_if: $CIRRUS_BRANCH != 'coverity_scan'
6767
windows_container:
6868
image: cirrusci/windowsservercore:2019
69+
env:
70+
MAKE_BIN: msbuild
71+
MAKEFLAGS: '/m /nologo /m /nologo /p:Configuration=Release'
72+
MATRIX_CC: cl
73+
MSYSTEM: MINGW64
6974
install_script:
7075
- choco install --no-progress -y winflexbison
7176
- win_flex --version
7277
- win_bison --version
78+
- dir "C:\Program Files\Git\bin"
79+
- dir "C:\Program Files\Git\usr\bin"
80+
- dir/s/a C:\uname.exe
7381
- choco install -y --no-progress msys2
7482
- choco install --no-progress -y curl
7583
- curl -O -s https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip
@@ -78,12 +86,8 @@ windows_task:
7886
- 7z x .\npcap-sdk-1.13.zip -oc:\projects\libpcap\Win32\npcap-sdk
7987
- curl -o AirPcap_Devpack.zip -L -s "https://support.riverbed.com/bin/support/download?sid=l3vk3eu649usgu3rj60uncjqqu"
8088
- 7z x .\AirPcap_Devpack.zip -oc:\projects\libpcap\Win32
81-
env:
82-
MAKE_BIN: msbuild
83-
MAKEFLAGS: '/m /nologo /m /nologo /p:Configuration=Release'
84-
MATRIX_CC: cl
8589
script:
86-
- C:\tools\msys64\usr\bin\bash -lc "./build_matrix.sh"
90+
- C:\tools\msys64\usr\bin\bash -lc ".\build_matrix.sh"
8791

8892
coverity_task:
8993
name: Coverity Scan

0 commit comments

Comments
 (0)