From a26129c78cd9096ca92c85fad6a235cd3f3384ee Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Mon, 28 Sep 2020 14:00:24 +0300 Subject: [PATCH] windows: rebuild docker image also: Revert "citemplate: set the cerbero msvc build to allow_failure again" This reverts commit 3dddfacfbf710fa71777488145594eb0abe11ee4. Part-of: --- docker/windows/build_image.ps1 | 2 +- gitlab/ci_template.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/windows/build_image.ps1 b/docker/windows/build_image.ps1 index c092f6d75b..4e19de3057 100644 --- a/docker/windows/build_image.ps1 +++ b/docker/windows/build_image.ps1 @@ -1,5 +1,5 @@ $env:DEFAULT_BRANCH='master' -$env:VERSION='v12' +$env:VERSION='v13' $env:tag ="registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:$env:VERSION-$env:DEFAULT_BRANCH" echo "Building $env:tag" docker build --build-arg DEFAULT_BRANCH=$env:DEFAULT_BRANCH -f Dockerfile -t $env:tag . diff --git a/gitlab/ci_template.yml b/gitlab/ci_template.yml index e825326e7f..7026ae525e 100644 --- a/gitlab/ci_template.yml +++ b/gitlab/ci_template.yml @@ -45,7 +45,7 @@ variables: TEST_MANIFEST_IMAGE: "$CI_REGISTRY_IMAGE/$TEST_MANIFEST_AMD64_SUFFIX:$TEST_MANIFEST_TAG-$GST_UPSTREAM_BRANCH" INDENT_IMAGE: "$CI_REGISTRY_IMAGE/$INDENT_AMD64_SUFFIX:$INDENT_TAG-$GST_UPSTREAM_BRANCH" - WINDOWS_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v12-master' + WINDOWS_IMAGE: 'registry.freedesktop.org/gstreamer/gst-ci/amd64/windows:v13-master' # Can't use $CI_* variables since we use this template in all repos, not just gst-ci CERBERO_SCRIPT_URL: "https://gitlab.freedesktop.org/gstreamer/gst-ci/raw/${GST_UPSTREAM_BRANCH}/gitlab/cerbero_setup.sh" @@ -1221,4 +1221,3 @@ build cerbero msvc x86_64: - C:\MinGW\msys\1.0\bin\bash.exe --login -c "cd $env:CI_PROJECT_DIR && $env:CERBERO_SCRIPTS_PATH cerbero_script" rules: - if: '$CI_PROJECT_NAME !~ /^(cerbero|gst-build|gst-omx|gstreamer-vaapi|gst-docs|gst-integration-testsuites|gst-plugins-rs)$/' - allow_failure: true