brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Rebase image to F38

Browse Source 
By now F38 is stable enough to use it as the base of our CI image,
so do that.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2913>
This commit is contained in:
Florian Müllner 2023-03-14 17:15:01 +01:00 committed by Marge Bot
parent b76a9100ea
commit e49e9ed59e
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.gitlab-ci.yml
View File

@ -17,8 +17,8 @@ variables:
.mutter.fedora@common: .mutter.fedora@common:
variables: variables:
FDO_DISTRIBUTION_VERSION: 37 FDO_DISTRIBUTION_VERSION: 38
BASE_TAG: '2023-02-22.0' BASE_TAG: '2023-05-19.0'
FDO_DISTRIBUTION_PACKAGES: FDO_DISTRIBUTION_PACKAGES:
asciidoc asciidoc
clang clang
@ -33,11 +33,8 @@ variables:
qemu-system-x86-core qemu-system-x86-core
busybox busybox
gi-docgen gi-docgen
python3-pip python3-dbusmock
pkgconfig(libgcrypt) pkgconfig(libgcrypt)
pkgconfig(colord)
pkgconfig(gnome-desktop-4)
pkgconfig(lcms2)
pkgconfig(libnma-gtk4) pkgconfig(libnma-gtk4)
FDO_DISTRIBUTION_EXEC: | FDO_DISTRIBUTION_EXEC: |
@ -48,16 +45,16 @@ variables:
dnf builddep -y wayland --setopt=install_weak_deps=False && dnf builddep -y wayland --setopt=install_weak_deps=False &&
dnf builddep -y wayland-protocols --setopt=install_weak_deps=False && dnf builddep -y wayland-protocols --setopt=install_weak_deps=False &&
dnf builddep -y kernel --setopt=install_weak_deps=False && dnf builddep -y kernel --setopt=install_weak_deps=False &&
dnf builddep -y zenity --setopt=install_weak_deps=False &&
./.gitlab-ci/install-meson-project.sh \ ./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/jadahl/catch.git \ https://gitlab.gnome.org/jadahl/catch.git \
main . 29ad36e2b1d28ac9d8b2bc44af46296cb1db5d66 && main . 29ad36e2b1d28ac9d8b2bc44af46296cb1db5d66 &&
# Pull in fix for # https://gitlab.gnome.org/GNOME/zenity/-/issues/58
./.gitlab-ci/install-meson-project.sh \ ./.gitlab-ci/install-meson-project.sh \
https://gitlab.gnome.org/GNOME/glib.git \ https://gitlab.gnome.org/GNOME/zenity.git \
2.75.1 . && master . db1ad8ee7c3db36a7cca6e998e86719293d37838 &&
pip install git+https://github.com/martinpitt/python-dbusmock.git@743da675c37bfc469ec385b88c3b4ad4838cfa48 &&
rpm -e --nodeps gnome-bluetooth-libs-devel \ rpm -e --nodeps gnome-bluetooth-libs-devel \
mutter mutter-devel \ mutter mutter-devel \
@ -71,9 +68,9 @@ variables:
dnf install -y python3-pyelftools && dnf install -y python3-pyelftools &&
git clone https://github.com/jadahl/virtme.git && git clone https://github.com/arighi/virtme.git &&
cd virtme && cd virtme &&
git checkout 87bcebe63f61e2a3ccd418b0903eab90113a47ae && git checkout aa99f43bd44c84dc95911ce99a8281cea5dfc5a1 &&
./setup.py install --prefix=/usr && ./setup.py install --prefix=/usr &&
cd .. && cd .. &&
rm -rf virtme rm -rf virtme