Commit 2bf94118 authored by Jordan Petridіs's avatar Jordan Petridіs 🌱
Browse files

fixup! ci: switch the Fedora base image to f34

parent 7eb3e005
Pipeline #423839 failed with stages
in 93 minutes and 30 seconds
......@@ -23,7 +23,7 @@ variables:
# If you are hacking on them or need a them to rebuild, its enough
# to change any part of the string of the image you want.
###
FEDORA_TAG: '2021-10-05.0'
FEDORA_TAG: '2021-10-14.0'
INDENT_TAG: '2021-10-04.0'
WINDOWS_TAG: "2021-10-12.0"
......@@ -35,8 +35,6 @@ variables:
WINDOWS_AMD64_SUFFIX: 'amd64/windows'
WINDOWS_RUST_AMD64_SUFFIX: 'amd64/windows-rust'
FEDORA_IMAGE: "$CI_REGISTRY_IMAGE/$FEDORA_AMD64_SUFFIX:$FEDORA_TAG-$GST_UPSTREAM_BRANCH"
INDENT_IMAGE: "$CI_REGISTRY_IMAGE/$INDENT_AMD64_SUFFIX:$INDENT_TAG-$GST_UPSTREAM_BRANCH"
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"
......@@ -686,15 +684,18 @@ valgrind ges:
# ---- Integration ----- #
.documentation:
image: $FEDORA_IMAGE
extends:
- '.fedora image'
- '.fdo.suffixed-image@fedora'
- '.build_ccache_vars'
needs:
- "fedora amd64 docker"
variables:
MESON_ARGS: *simple_build
MESON_BUILDTYPE_ARGS: "-Ddoc=enabled"
CI_ARTIFACTS_URL: "${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/"
script:
- pip3 install --upgrade hotdoc
- export MESON_ARGS="$MESON_ARGS -Ddoc=enabled"
- *build
- ./gst-env.py ninja -C build/ plugins_doc_caches
- ./ci/scripts/check-documentation-diff.py
......@@ -728,8 +729,6 @@ build documentation:
extends:
- '.documentation'
stage: build
needs:
- "trigger"
rules:
# Never run post merge, we have the `documentation` always running for that
- if: '$CI_PROJECT_NAMESPACE == "gstreamer" && $CI_COMMIT_BRANCH == $GST_UPSTREAM_BRANCH'
......
......@@ -37,6 +37,7 @@ dnf install -y \
gdb \
git-lfs \
glslc \
gtk-doc \
gtk3 \
gtk3-devel \
gtest \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment