diff options
author | Jordan Petridis <jordan@centricular.com> | 2022-05-13 11:23:45 +0300 |
---|---|---|
committer | Jordan PetridÑ–s <jpetridis@gnome.org> | 2022-05-18 09:14:08 +0000 |
commit | 5cd3f6884203fd578e385010b07f92a00bffb8dd (patch) | |
tree | 24758c97b4352ffa0ed17584f185bd2ff97d3250 /ci | |
parent | c861664356d933fac6c37494bd67650169fdc2cb (diff) | |
download | gstreamer-5cd3f6884203fd578e385010b07f92a00bffb8dd.tar.gz |
ci: remove windows-rust jobs
These are moved now into gstreamer-rs repository.
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/701
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2395>
Diffstat (limited to 'ci')
-rw-r--r-- | ci/docker/windows/build_image.ps1 | 9 | ||||
-rw-r--r-- | ci/docker/windows/install_gst.ps1 | 61 | ||||
-rw-r--r-- | ci/docker/windows/rust.Dockerfile | 21 |
3 files changed, 0 insertions, 91 deletions
diff --git a/ci/docker/windows/build_image.ps1 b/ci/docker/windows/build_image.ps1 index 0fadb7e284..97f35d8695 100644 --- a/ci/docker/windows/build_image.ps1 +++ b/ci/docker/windows/build_image.ps1 @@ -3,7 +3,6 @@ $env:ErrorActionPreference='Stop' $env:DEFAULT_BRANCH='main' $env:VERSION='test' $env:tag ="registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:$env:VERSION-$env:DEFAULT_BRANCH" -$env:rust_tag ="registry.freedesktop.org/gstreamer/gst-ci/amd64/windows-rust:$env:VERSION-$env:DEFAULT_BRANCH" Set-Location './docker/windows/' @@ -16,12 +15,4 @@ if (!$?) { } Get-Date -Write-Output "Building $env:rust_tag" -docker build --isolation=hyperv -m 12g --build-arg DEFAULT_BRANCH=$env:DEFAULT_BRANCH -f rust.Dockerfile -t $env:rust_tag . -if (!$?) { - Write-Host "Failed to build docker image $env:rust_tag" - Exit 1 -} - -Get-Date Write-Output "Build Finished"
\ No newline at end of file diff --git a/ci/docker/windows/install_gst.ps1 b/ci/docker/windows/install_gst.ps1 deleted file mode 100644 index b346c8700b..0000000000 --- a/ci/docker/windows/install_gst.ps1 +++ /dev/null @@ -1,61 +0,0 @@ -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; - -# 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 gstreamer" - Exit 1 -} - -Set-Location C:\gstreamer - -# Copy the cache we already have in the image to avoid massive redownloads -Move-Item C:/subprojects/* C:\gstreamer\subprojects - -if (!$?) { - Write-Host "Failed to copy subprojects cache" - Exit 1 -} - -# Update the subprojects cache -Write-Output "Running meson subproject reset" -meson subprojects update --reset - -if (!$?) { - Write-Host "Failed to reset subprojects state" - Exit 1 -} - -$env:MESON_ARGS = "-Dglib:installed_tests=false " + - "-Dlibnice:tests=disabled " + - "-Dlibnice:examples=disabled " + - "-Dffmpeg:tests=disabled " + - "-Dopenh264:tests=disabled " + - "-Dpygobject:tests=false " + - "-Dugly=enabled " + - "-Dbad=enabled " + - "-Dges=enabled " + - "-Drtsp_server=enabled " + - "-Ddevtools=enabled " + - "-Dsharp=disabled " + - "-Dpython=disabled " + - "-Dlibav=disabled " + - "-Dvaapi=disabled " + - "-Dgst-plugins-base:pango=enabled " + - "-Dgst-plugins-good:cairo=enabled " + - "-Dgpl=enabled " - -Write-Output "Building gst" -cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && meson _build $env:MESON_ARGS && meson compile -C _build && ninja -C _build install" - -if (!$?) { - Write-Host "Failed to build and install gst" - Exit 1 -} - -git clean -fdxx - -if (!$?) { - Write-Host "Failed to git clean" - Exit 1 -} diff --git a/ci/docker/windows/rust.Dockerfile b/ci/docker/windows/rust.Dockerfile deleted file mode 100644 index f3742454a3..0000000000 --- a/ci/docker/windows/rust.Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -# escape=` - -# Expect this to be set when calling docker build with -# --build-arg BASE_IMAGE="" and make it fail if not set. -ARG BASE_IMAGE="inavlid.gstreamer.freedesktop.org/invalid" -FROM $BASE_IMAGE - -ARG DEFAULT_BRANCH="main" -ARG RUST_VERSION="invalid" - -COPY install_gst.ps1 C:\ -RUN C:\install_gst.ps1 -RUN choco install -y pkgconfiglite -ENV PKG_CONFIG_PATH="C:/lib/pkgconfig" - -ADD https://win.rustup.rs/x86_64 C:\rustup-init.exe -RUN C:\rustup-init.exe -y --profile minimal --default-toolchain $env:RUST_VERSION - -# Uncomment for easy testing -# RUN git clone --depth 1 https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git -# RUN cd gstreamer-rs; cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64; cargo build --all; cargo test --all"
\ No newline at end of file |