diff options
author | Jordan Petridis <jordan@centricular.com> | 2022-04-26 20:00:16 +0300 |
---|---|---|
committer | Jordan PetridÑ–s <jpetridis@gnome.org> | 2022-05-05 21:33:43 +0000 |
commit | 1d627e29cd192ed5b544abcd62094a92a317fa00 (patch) | |
tree | 12615f4a8a2d009917451d7ba90eb45606384533 /ci | |
parent | 47ff41bcd2519257b275b191cd93284269344bd8 (diff) | |
download | gstreamer-1d627e29cd192ed5b544abcd62094a92a317fa00.tar.gz |
ci: fix the windows-rust image builds
There was a rule gated on the project name which wasn't removed
once we moved to the monorepo and this job was silently broken
since.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2302>
Diffstat (limited to 'ci')
-rw-r--r-- | ci/docker/windows/install_gst.ps1 | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/ci/docker/windows/install_gst.ps1 b/ci/docker/windows/install_gst.ps1 index 7d961cddb6..b346c8700b 100644 --- a/ci/docker/windows/install_gst.ps1 +++ b/ci/docker/windows/install_gst.ps1 @@ -1,19 +1,16 @@ [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; -# Download gst-build and all its subprojects -# git clone -b $env:DEFAULT_BRANCH https://gitlab.freedesktop.org/gstreamer/gst-build.git C:\gst-build -# FIXME: need 1.19+ for cairo subproject :/ -# Should use a stable branch instead -git clone -b master --depth 1 https://gitlab.freedesktop.org/gstreamer/gst-build.git C:\gst-build +# Download gstreamer and all its subprojects +git clone -b $env:DEFAULT_BRANCH --depth 1 https://gitlab.freedesktop.org/gstreamer/gstreamer.git C:\gstreamer if (!$?) { - Write-Host "Failed to clone gst-build" + Write-Host "Failed to clone gstreamer" Exit 1 } -Set-Location C:\gst-build +Set-Location C:\gstreamer # Copy the cache we already have in the image to avoid massive redownloads -Move-Item C:/subprojects/* C:\gst-build\subprojects +Move-Item C:/subprojects/* C:\gstreamer\subprojects if (!$?) { Write-Host "Failed to copy subprojects cache" @@ -29,14 +26,6 @@ if (!$?) { Exit 1 } -Write-Output "Running git update" -python git-update --no-interaction - -if (!$?) { - Write-Host "Failed to run git-update" - Exit 1 -} - $env:MESON_ARGS = "-Dglib:installed_tests=false " + "-Dlibnice:tests=disabled " + "-Dlibnice:examples=disabled " + |