diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d8335f5396..e338a0bd75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,21 +35,11 @@ variables: FEDORA_AMD64_SUFFIX: 'amd64/fedora' INDENT_AMD64_SUFFIX: 'amd64/gst-indent' WINDOWS_AMD64_SUFFIX: 'amd64/windows' - WINDOWS_RUST_AMD64_SUFFIX: 'amd64/windows-rust' FEDORA_DOCS_IMAGE: "registry.freedesktop.org/gstreamer/gst-ci/amd64/fedora:2020-07-03.0-master" WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH" WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$GST_UPSTREAM_REPO/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH" - RUST_MINIMUM_VERSION: '1.54.0' - RUST_LATEST_VERSION: '1.55.0' - - WINDOWS_RUST_MINIMUM_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_RUST_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH-rust-$RUST_MINIMUM_VERSION" - WINDOWS_RUST_MINIMUM_UPSTREAM_IMAGE: "$CI_REGISTRY/$GST_UPSTREAM_REPO/$WINDOWS_RUST_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH-rust-$RUST_MINIMUM_VERSION" - - WINDOWS_RUST_LATEST_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_RUST_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH-rust-$RUST_LATEST_VERSION" - WINDOWS_RUST_LATEST_UPSTREAM_IMAGE: "$CI_REGISTRY/$GST_UPSTREAM_REPO/$WINDOWS_RUST_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH-rust-$RUST_LATEST_VERSION" - MESON_BUILDTYPE_ARGS: --default-library=both DEFAULT_MESON_ARGS: > -Dlibnice:tests=disabled @@ -191,55 +181,6 @@ windows amd64 docker: Exit 1 } -.windows rust docker build: - stage: 'build docker' - needs: - - job: 'windows amd64 docker' - artifacts: false - rules: - - if: '$CI_PROJECT_NAME == "gst-ci"' - variables: - # Unlike the buildah/linux jobs, this file - # needs to be relative to docker/windows/ subdir - # as it makes life easier in the powershell script - # - # We also don't need a CONTEXT_DIR var as its also - # hardcoded to be docker/windows/ - DOCKERFILE: 'docker/windows/rust.Dockerfile' - tags: - - 'windows' - - 'shell' - - '2022' - script: - # We need to pass an array and to resolve the env vars, so we can't use a variable: - - $DOCKER_BUILD_ARGS = @("--build-arg", "DEFAULT_BRANCH=$GST_UPSTREAM_BRANCH", "--build-arg", "BASE_IMAGE=$WINDOWS_IMAGE", "--build-arg", "RUST_VERSION=$RUST_VERSION") - - - $env:WINDOWS_CONTAINER_SCRIPT_PATH = "$env:CI_PROJECT_DIR\container.ps1" - - echo "Fetching $env:WINDOWS_CONTAINER_SCRIPT_URL" - - Invoke-WebRequest -Uri $env:WINDOWS_CONTAINER_SCRIPT_URL -OutFile $env:WINDOWS_CONTAINER_SCRIPT_PATH - - - "& $env:WINDOWS_CONTAINER_SCRIPT_PATH $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $RUST_IMAGE $RUST_UPSTREAM_IMAGE $DOCKERFILE" - - | - if (!($?)) { - echo "Failed to build the image" - Exit 1 - } - -windows rust amd64 docker latest stable: - extends: '.windows rust docker build' - variables: - RUST_IMAGE: !reference [variables, "WINDOWS_RUST_LATEST_IMAGE"] - RUST_UPSTREAM_IMAGE: !reference [variables, "WINDOWS_RUST_LATEST_UPSTREAM_IMAGE"] - RUST_VERSION: !reference [variables, "RUST_LATEST_VERSION"] - -windows rust amd64 docker minimum supported version: - extends: '.windows rust docker build' - variables: - RUST_IMAGE: !reference [variables, "WINDOWS_RUST_MINIMUM_IMAGE"] - RUST_UPSTREAM_IMAGE: !reference [variables, "WINDOWS_RUST_MINIMUM_UPSTREAM_IMAGE"] - RUST_VERSION: !reference [variables, "RUST_MINIMUM_VERSION"] - - # ---- Preparation ----- # # 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/' @@ -15,13 +14,5 @@ if (!$?) { Exit 1 } -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/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