From 44d574e1762031114d46d5e6a59c3f31a9012928 Mon Sep 17 00:00:00 2001
From: Ondrej Holy <oholy@redhat.com>
Date: Fri, 8 Oct 2021 12:53:35 +0200
Subject: ci: Remove fedora job

The fedora job was there before the flatpak job. But now we relies on
flatpak job and the fedora job doesn't really give much benefits. It is
rather waste of runners and maintainers time. Let's remove it.
---
 .gitlab-ci.yml     | 15 ---------------
 .gitlab/Dockerfile | 28 ++--------------------------
 2 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7ceec5eb1..3d2fa263c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,6 @@ variables:
 stages:
     - image
     - test
-    - cross environment
     - deploy
 
 flatpak:
@@ -24,20 +23,6 @@ nightly:
     dependencies:
         - flatpak
 
-fedora latest:
-    image:
-        name: registry.gitlab.gnome.org/gnome/nautilus:latest
-        entrypoint: ["/bin/sh", "-c"]
-    stage: cross environment
-    script:
-        - meson _build .
-        - cd _build
-        - ninja test
-    only:
-        - web
-        - master
-    allow_failure: true
-
 style check:
     image: registry.gitlab.gnome.org/gnome/nautilus:latest
     stage: test
diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile
index 69cd3414f..f473ada6e 100644
--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
@@ -1,31 +1,7 @@
 FROM fedora:latest
 
-RUN dnf install --nogpg -y dnf-plugins-core findutils git libportal-devel tracker3-miners python3-gobject dbus-daemon libhandy1-devel \
- && dnf builddep --nogpg -y nautilus \
- && dnf clean all
-
-RUN dnf install --nogpg -y gnome-common \
- && dnf builddep --nogpg -y gnome-autoar \
- && dnf clean all \
- && git clone --depth 1 https://gitlab.gnome.org/GNOME/gnome-autoar.git \
- && cd gnome-autoar \
- && meson . _build --prefix=/usr \
- && ninja -C _build \
- && ninja -C _build install \
- && cd .. \
- && rm -rf gnome-autoar
-
-RUN dnf builddep --nogpg -y libhandy \
- && dnf clean all \
- && git clone --depth 1 https://gitlab.gnome.org/GNOME/libhandy.git \
- && cd libhandy \
- && meson . _build --prefix=/usr \
- && ninja -C _build \
- && ninja -C _build install \
- && cd .. \
- && rm -rf libhandy
-
-RUN dnf builddep --nogpg -y uncrustify \
+RUN dnf install --nogpg -y dnf-plugins-core findutils git \
+ && dnf builddep --nogpg -y uncrustify \
  && dnf clean all \
  && git clone --depth 1 https://github.com/uncrustify/uncrustify.git \
  && cd uncrustify \
-- 
cgit v1.2.1