mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 16:26:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

ci: fix the windows-rust image builds

Browse source 
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>
This commit is contained in:
Jordan Petridis 2022-04-26 20:00:16 +03:00 committed by Jordan Petridіs
parent 47ff41bcd2
commit 1d627e29cd
2 changed files with 7 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -198,8 +198,6 @@ windows amd64 docker:
needs: needs:
- job: 'windows amd64 docker' - job: 'windows amd64 docker'
artifacts: false artifacts: false
rules:
- if: '$CI_PROJECT_NAME == "gst-ci"'
variables: variables:
# Unlike the buildah/linux jobs, this file # Unlike the buildah/linux jobs, this file
# needs to be relative to docker/windows/ subdir # needs to be relative to docker/windows/ subdir
@ -207,7 +205,7 @@ windows amd64 docker:
# #
# We also don't need a CONTEXT_DIR var as its also # We also don't need a CONTEXT_DIR var as its also
# hardcoded to be docker/windows/ # hardcoded to be docker/windows/
DOCKERFILE: 'docker/windows/rust.Dockerfile' DOCKERFILE: 'ci/docker/windows/rust.Dockerfile'
tags: tags:
- 'windows' - 'windows'
- 'shell' - 'shell'
@ -216,11 +214,7 @@ windows amd64 docker:
# We need to pass an array and to resolve the env vars, so we can't use a variable: # 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") - $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" - "& ci/docker/windows/container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $RUST_IMAGE $RUST_UPSTREAM_IMAGE $DOCKERFILE"
- 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 (!($?)) { if (!($?)) {
echo "Failed to build the image" echo "Failed to build the image"

21
ci/docker/windows/install_gst.ps1
View file

@ -1,19 +1,16 @@
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;
# Download gst-build and all its subprojects # Download gstreamer and all its subprojects
# git clone -b $env:DEFAULT_BRANCH https://gitlab.freedesktop.org/gstreamer/gst-build.git C:\gst-build git clone -b $env:DEFAULT_BRANCH --depth 1 https://gitlab.freedesktop.org/gstreamer/gstreamer.git C:\gstreamer
# 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
if (!$?) { if (!$?) {
Write-Host "Failed to clone gst-build" Write-Host "Failed to clone gstreamer"
Exit 1 Exit 1
} }
Set-Location C:\gst-build Set-Location C:\gstreamer
# Copy the cache we already have in the image to avoid massive redownloads # 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 (!$?) { if (!$?) {
Write-Host "Failed to copy subprojects cache" Write-Host "Failed to copy subprojects cache"
@ -29,14 +26,6 @@ if (!$?) {
Exit 1 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 " + $env:MESON_ARGS = "-Dglib:installed_tests=false " +
"-Dlibnice:tests=disabled " + "-Dlibnice:tests=disabled " +
"-Dlibnice:examples=disabled " + "-Dlibnice:examples=disabled " +