aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2023-07-01 16:27:13 -0700
committerGuy Harris <gharris@sonic.net>2023-07-01 16:27:13 -0700
commitaf25cb3bff355b5cfdea78fab9fd39f6bd289e50 (patch)
treeb8b137f72c2f1560754dc5ddfb141b98f9f45584
parentccc4182e59cc5adb90859febc37e4bc47c0626c1 (diff)
Cirrus CI: see what's in C:\Program Files (x86).
That's probably where Visual Studio is hiding, and we'll probably have to run the vcvars.bat script to get the directory containing cl.exe into the Windows path. (And the paths for stuff under C:\Program Files\Git looks weird because that stuff appears under / in git-bash; that's not the problem.)
-rw-r--r--.cirrus.yml8
1 files changed, 2 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 598b14b9..be8aeb0d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -73,10 +73,7 @@ windows_task:
MATRIX_CMAKE: yes
MSYSTEM: MINGW64
install_script:
- - dir/s "C:\Program Files\Git\cmd"
- - dir/s "C:\Program Files\Git\mingw64\bin"
- - dir/s "C:\Program Files\Git\usr\bin"
- - dir/s "C:\cl.exe"
+ - dir "C:\Program Files (x86)"
- choco install --no-progress -y winflexbison
- win_flex --version
- win_bison --version
@@ -88,8 +85,7 @@ windows_task:
- curl -o AirPcap_Devpack.zip -L -s "https://support.riverbed.com/bin/support/download?sid=l3vk3eu649usgu3rj60uncjqqu"
- 7z x .\AirPcap_Devpack.zip -oc:\projects\libpcap\Win32
script:
- - sh -c "ls /cmd /mingw64/bin /usr/bin"
- - sh -lc "WINDOWS_PATH='%PATH%'; export WINDOWS_PATH; env; ./build_matrix.sh"
+ - sh -lc ./build_matrix.sh
coverity_task:
name: Coverity Scan