diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2021-04-19 19:10:13 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2021-04-19 19:46:05 -0400 |
| commit | 44d606a8781958c3a359f425d4dd5b8990a0e383 (patch) | |
| tree | 27785b329073895cf5b8b039a3161ffe574ca118 | |
| parent | 667a575ab49fb6fa3f9856abb01560e61621164d (diff) | |
| download | libnice-44d606a8781958c3a359f425d4dd5b8990a0e383.tar.gz | |
gitlab-ci: Move pacman setup to before_script
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6607ad..7c67f6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,14 +63,15 @@ build msys2: ErrorActionPreference: 'Stop' WarningPreference: 'Stop' before_script: - - pip3 install -U meson==0.56.2 - script: # Make sure powershell exists on errors # https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_preference_variables?view=powershell-6 - $ErrorActionPreference = "Stop" + - pip3 install -U meson==0.56.2 + # 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' + # It seems that the gpg doesn't like the SSL secured version of the keyserver - C:\msys64\usr\bin\bash -c "pacman-key --init && pacman-key --populate msys2 && pacman-key --refresh-keys || true" - echo "Download newest msys2 keyring" @@ -79,6 +80,13 @@ build msys2: - C:\msys64\usr\bin\bash -c "pacman-key --refresh-keys || true" - C:\msys64\usr\bin\bash -c "pacman -Sy --noconfirm --needed mingw-w64-x86_64-toolchain ninja" + script: + # Make sure powershell exists on errors + # 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' + # 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"," ") |