summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Petridis <jordan@centricular.com>2022-05-18 12:25:48 +0300
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2022-10-18 09:13:51 +0000
commite93a44afe185423bca0dc18e5529519b13f98a91 (patch)
tree98baf66628e3164bf24a77c73c2707fa3c434100
parent030019d08141530760877ec20b00fb100ec124bb (diff)
ci: Update fedora images to f36
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/966>
-rw-r--r--.gitlab-ci.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 77f04c7e..cc4e180b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,9 +47,9 @@ default:
# 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.
###
- FDO_DISTRIBUTION_TAG: '2021-09-13.0'
- FDO_DISTRIBUTION_VERSION: '31'
- FDO_DISTRIBUTION_PACKAGES: sudo git lbzip2 rsync wine which
+ FDO_DISTRIBUTION_TAG: '2022-08-21.0'
+ FDO_DISTRIBUTION_VERSION: '36'
+ FDO_DISTRIBUTION_PACKAGES: sudo git-core lbzip2 rsync wine which python3-distro
FDO_DISTRIBUTION_EXEC: ci/docker_setup.sh
FDO_UPSTREAM_REPO: gstreamer/cerbero
@@ -61,9 +61,9 @@ default:
# 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.
###
- FDO_DISTRIBUTION_TAG: '2022-03-28.0'
- FDO_DISTRIBUTION_VERSION: '35'
- FDO_DISTRIBUTION_PACKAGES: file git-core java-11-openjdk-devel lbzip2 make pkg-config unzip which xz
+ FDO_DISTRIBUTION_TAG: '2022-08-21.0'
+ FDO_DISTRIBUTION_VERSION: '36'
+ FDO_DISTRIBUTION_PACKAGES: file git-core java-11-openjdk-devel lbzip2 python3-distro make pkg-config unzip which xz
FDO_DISTRIBUTION_EXEC: ci/docker_android_setup.sh $ANDROID_HOME $ANDROID_NDK_HOME $GST_UPSTREAM_BRANCH
FDO_UPSTREAM_REPO: gstreamer/cerbero
FDO_REPO_SUFFIX: android