diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2020-02-08 03:17:22 +0300 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2020-02-08 03:24:10 +0300 |
| commit | eacf7e738ac016d84d8d7bf97489ef81c6ab1a2e (patch) | |
| tree | 360106ecaf0a20debe2249e4e5248eb12061efef | |
| parent | 9901a96eaff271c2d3b595214213f6805ff803c8 (diff) | |
ci: update windows runner tag and image
| -rw-r--r-- | .gitlab-ci.yml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d8ffa0..0517648 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,12 +22,12 @@ debian sid: - build/meson-logs/ .build windows: - image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v6' + image: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v8' stage: 'build' tags: - 'docker' - 'windows' - - '1607' + - '1809' variables: # Make sure any failure in PowerShell scripts is fatal ErrorActionPreference: 'Stop' @@ -69,7 +69,12 @@ msys2: # 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" + - $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 + - 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 "pacman -Sy --noconfirm --needed mingw-w64-x86_64-toolchain ninja" - C:\msys64\usr\bin\bash -c "meson build $env:MESON_ARGS && ninja -C build && ninja -C build test" |