diff options
author | Ondrej Holy <oholy@redhat.com> | 2021-09-24 11:25:07 +0200 |
---|---|---|
committer | Ondrej Holy <oholy@redhat.com> | 2021-09-24 15:53:27 +0200 |
commit | 9db8bb3e4b452731db764e368faa9d16bfe4f7a7 (patch) | |
tree | 5823abcb48195c229b5715c0d51b7fcb48328f7d | |
parent | d78dc072d861415627fa7927ce182d0e6f361b48 (diff) | |
download | nautilus-wip/oholy/ci-improvements.tar.gz |
ci: Remove fedora jobwip/oholy/ci-improvements
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.
-rw-r--r-- | .gitlab-ci.yml | 40 | ||||
-rw-r--r-- | .gitlab/Dockerfile | 38 |
2 files changed, 1 insertions, 77 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b75c6637..573d6235d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,9 +5,7 @@ variables: BUNDLE: "nautilus-dev.flatpak" stages: - - image - test - - cross environment - deploy flatpak: @@ -22,20 +20,7 @@ flatpak: nightly: extends: '.publish_nightly' dependencies: - -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 + - flatpak style check: image: @@ -55,26 +40,3 @@ style check: - git diff --exit-code | tee uncrustify.diff except: - /^gnome-.*$/ - -update image: - variables: - STORAGE_DRIVER: vfs - BUILDAH_FORMAT: docker - BUILDAH_ISOLATION: chroot - image: registry.fedoraproject.org/fedora:33 - stage: image - script: - - dnf install -y buildah runc - - sed -i '/^mountopt =.*/d' /etc/containers/storage.conf - - buildah bud --tag $CI_REGISTRY_IMAGE -f .gitlab/Dockerfile - - buildah tag $CI_REGISTRY_IMAGE "$CI_REGISTRY_IMAGE:v$CI_JOB_ID" - - buildah login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - buildah push $CI_REGISTRY_IMAGE - - buildah push "$CI_REGISTRY_IMAGE:v$CI_JOB_ID" - when: manual - only: - - web - - master - except: - variables: - - $CI_PROJECT_NAMESPACE != "GNOME" diff --git a/.gitlab/Dockerfile b/.gitlab/Dockerfile deleted file mode 100644 index 69cd3414f..000000000 --- a/.gitlab/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -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 \ - && dnf clean all \ - && git clone --depth 1 https://github.com/uncrustify/uncrustify.git \ - && cd uncrustify \ - && mkdir build \ - && cd build \ - && cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ - && make \ - && make install \ - && cd ../.. \ - && rm -rf uncrustify |