From 52101aabb729c8e522f1a9b304bfaaaa334f37ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Mon, 17 Apr 2023 09:42:59 +0200 Subject: [PATCH] fixup! ci: use latest gstreamer image which includes rust --- ci/images_template.yml | 2 +- ci/windows-docker/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/images_template.yml b/ci/images_template.yml index b9b33a8..5074bd3 100644 --- a/ci/images_template.yml +++ b/ci/images_template.yml @@ -1,3 +1,3 @@ variables: GST_RS_STABLE: '1.67.0' - GST_RS_IMG_TAG: '2023-04-14.1' + GST_RS_IMG_TAG: '2023-04-17.1' diff --git a/ci/windows-docker/Dockerfile b/ci/windows-docker/Dockerfile index 8a0789d..1722799 100644 --- a/ci/windows-docker/Dockerfile +++ b/ci/windows-docker/Dockerfile @@ -22,8 +22,8 @@ RUN C:\install_pango.ps1 RUN C:\install_gst.ps1 RUN C:\install_gtk.ps1 -RUN Invoke-WebRequest -Uri https://win.rustup.rs/x86_64 -OutFile C:\rustup-init.exe -RUN C:\rustup-init.exe -y --profile minimal --default-toolchain $env:RUST_VERSION +# rustup has now been installed in gstreamer/amd64/windows:2023-04-03.0-main, just set the right version which will install cargo etc. +RUN rustup override set $env:RUST_VERSION RUN Invoke-WebRequest -Uri https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-shared-64.exe -OutFile C:\gettext0.21.exe RUN C:\gettext0.21.exe /SILENT