mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-07 20:31:20 +00:00
windows: rebuild docker image
also:
Revert "citemplate: set the cerbero msvc build to allow_failure again"
This reverts commit 3dddfacfbf
.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-ci/-/merge_requests/359>
This commit is contained in:
parent
b8e112ed74
commit
a26129c78c
2 changed files with 2 additions and 3 deletions
|
@ -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 .
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue