@@ -527,8 +527,8 @@ build vs2022 amd64:
527
527
extends : ' .build windows'
528
528
script :
529
529
- !reference [".build windows", "script"]
530
- - meson setup --vsenv build $env:MESON_ARGS $env:GTK_ARGS
531
- - meson compile -C build --jobs $env:FDO_CI_CONCURRENT
530
+ - .\ci\run_retry.ps1 meson setup --vsenv build $env:MESON_ARGS $env:GTK_ARGS
531
+ - .\ci\run_retry.ps1 meson compile -C build --jobs $env:FDO_CI_CONCURRENT
532
532
- .\gst-env.py gst-inspect-1.0.exe --version
533
533
- .\gst-env.py gst-inspect-1.0.exe
534
534
- mkdir destdir
@@ -543,7 +543,7 @@ build vs2022 amd64 full-static:
543
543
script :
544
544
- !reference [".build windows", "script"]
545
545
- cmd.exe /C "meson setup --vsenv build --default-library=static $env:MESON_ARGS"
546
- - meson compile -C build --jobs $env:FDO_CI_CONCURRENT
546
+ - .\ci\run_retry.ps1 meson compile -C build --jobs $env:FDO_CI_CONCURRENT
547
547
- .\gst-env.py gst-inspect-1.0.exe --version
548
548
- .\gst-env.py gst-inspect-1.0.exe
549
549
variables :
@@ -561,8 +561,10 @@ build vs2022 amd64 full-static:
561
561
# Setting up a cross build with MSVC is still non-trivial because
562
562
# the --vsenv argument cannot be used to set it up
563
563
- echo $env:MESON_CROSS_ARGS
564
- - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH && meson setup build $env:MESON_ARGS $env:GTK_ARGS $env:MESON_CROSS_ARGS"
565
- - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH && meson compile -C build --jobs $env:FDO_CI_CONCURRENT"
564
+ - $env:JOB="meson setup build $env:MESON_ARGS $env:GTK_ARGS $env:MESON_CROSS_ARGS"
565
+ - cmd.exe /C """C:\BuildTools\VC\Auxiliary\Build\vcvarsamd64_$env:ARCH.bat"" && powershell.exe -ExecutionPolicy Bypass -File .\ci\run_retry.ps1"
566
+ - $env:JOB="meson compile -C build --jobs $env:FDO_CI_CONCURRENT"
567
+ - cmd.exe /C """C:\BuildTools\VC\Auxiliary\Build\vcvarsamd64_$env:ARCH.bat"" && powershell.exe -ExecutionPolicy Bypass -File .\ci\run_retry.ps1"
566
568
567
569
build vs2022 x86 :
568
570
extends : ' .build windows cross'
0 commit comments