Commit 93b9fb29 authored by Nirbheek Chauhan's avatar Nirbheek Chauhan 🐜
Browse files

ci: Attempt to fix broken Windows CI

https://gitlab.freedesktop.org/nirbheek/orc/-/pipelines/169274

Update to latest image and use the gstreamer runner tag. Matches the
gst-ci template.

Also try to make MSYS2 CI more resilient by following:
https://github.com/msys2/setup-msys2/blob/master/main.js#L98

Part-of: <!42>
parent 408e7fa3
Pipeline #169892 passed with stage
in 5 minutes and 35 seconds
......@@ -22,12 +22,13 @@ debian sid:
- build/meson-logs/
.build windows:
image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v8'
image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v11-master'
stage: 'build'
tags:
- 'docker'
- 'windows'
- '1809'
- 'gstreamer-windows'
variables:
# Make sure any failure in PowerShell scripts is fatal
ErrorActionPreference: 'Stop'
......@@ -65,15 +66,17 @@ vs2017 x86:
msys2:
extends: '.build windows'
script:
# For some reason, options are separated by newline instead of space, so we
# have to replace them first.
# - $env:MESON_ARGS = $env:MESON_ARGS.replace("`n"," ")
- $env:PATH += ";C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\msys64\mingw32\bin"
# XXX: Copied from https://gitlab.freedesktop.org/gstreamer/gst-ci/blob/master/gitlab/ci_template.yml#L487
# For some reason docker build hangs if this is included in the image, needs more troubleshooting
- $env:PATH += ";C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\msys64\mingw32\bin"
- C:\msys64\usr\bin\bash -c "pacman-key --init && pacman-key --populate msys2 && pacman-key --refresh-keys || true"
- C:\msys64\usr\bin\bash -c "pacman -Syuu --noconfirm"
- C:\msys64\usr\bin\bash -c "sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf"
- echo "Updating MSYS2"
- C:\msys64\usr\bin\bash -c "pacman -Syuu --noconfirm || echo Update failed, ignoring"
- echo "Killing all MSYS2 processes"
- taskkill /F /FI "MODULES eq msys-2.0.dll"
- echo "Completing MSYS2 update"
- C:\msys64\usr\bin\bash -c "pacman -Suu --noconfirm"
- echo "Installing needed MSYS2 packages"
- C:\msys64\usr\bin\bash -c "pacman -Sy --noconfirm --needed mingw-w64-x86_64-toolchain ninja"
- C:\msys64\usr\bin\bash -c "meson --werror build $env:MESON_ARGS &&
ninja -C build &&
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment