diff options
| author | Andoni Morales Alastruey <ylatuya@gmail.com> | 2021-10-12 23:13:44 +0200 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-10-14 10:13:51 +0000 |
| commit | 4be5c7ce0af79807123b8c974e19bc9bacdb2113 (patch) | |
| tree | f34a81ec12bf14dbafaa4e44fc8e472f3da3b899 /.gitlab-ci.yml | |
| parent | a1e332bf7e93d68029a71158d66ae641453fc0d3 (diff) | |
| download | gstreamer-4be5c7ce0af79807123b8c974e19bc9bacdb2113.tar.gz | |
Fix GStreamer msys2 builds in the CI
Install ninja and the toolchain in the docker image.
Use the UCRT64 environment for building
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1000>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 356afb5264..0b143a3dc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -438,26 +438,17 @@ build msys2 : # https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_preference_variables?view=powershell-6 - $ErrorActionPreference = "Stop" - # 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' - # Copied from https://github.com/msys2/setup-msys2/blob/master/main.js#L98 - - C:\msys64\usr\bin\bash -c "pacman-key --init && pacman-key --populate msys2 && pacman-key --refresh-keys || true" - - 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" - + # Configure MSYS2 to use the UCRT64 environment, start in the same directory + # and inherit PATH + - $env:MSYSTEM = "UCRT64" + - $env:CHERE_INVOKING = "1" + - $env:MSYS2_PATH_TYPE = "inherit" # 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"," ") # Replace forward slashes with backwards so bash doesn't complain - $env:_PROJECT_DIR = $env:CI_PROJECT_DIR.replace('\','/') - - C:\msys64\usr\bin\bash -c "meson build $env:MESON_ARGS && ninja -C build" + - C:\msys64\usr\bin\bash -lc "meson build $env:MESON_ARGS && ninja -C build" # ---- Tests ----- # |