diff options
author | Ondrej Holy <oholy@redhat.com> | 2021-08-11 10:03:17 +0200 |
---|---|---|
committer | Ondrej Holy <oholy@redhat.com> | 2021-09-24 11:12:51 +0200 |
commit | 12bce3ebf952ef684937bb42e4369beb5dea45d6 (patch) | |
tree | de6b2be4302be90e62ffa31cbfb5fe69f37779ed | |
parent | 50995cc91d3df9757db795700145da1162359ea0 (diff) | |
download | nautilus-12bce3ebf952ef684937bb42e4369beb5dea45d6.tar.gz |
ci: Remove flatpak master job
The flatpak master job seems to be redundant currently. It uses the same
image as flatpak devel and their .yml files are equal. The two flatpak jobs
are relict from the times when GNOME SDK was unstable and broke CI often,
which is no more true. Let's remove the flatpak master job.
-rw-r--r-- | .gitlab-ci.yml | 18 | ||||
-rw-r--r-- | build-aux/flatpak/org.gnome.NautilusMaster.yml | 103 |
2 files changed, 1 insertions, 120 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09376c7b6..920e6cd61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ stages: - cross environment - deploy -flatpak devel: +flatpak: extends: '.flatpak' image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master variables: @@ -22,7 +22,6 @@ flatpak devel: nightly: extends: '.publish_nightly' dependencies: - - 'flatpak devel' fedora latest: image: @@ -38,21 +37,6 @@ fedora latest: - master allow_failure: true -flatpak master: - stage: cross environment - dependencies: [] - variables: - MANIFEST_PATH: "build-aux/flatpak/org.gnome.NautilusMaster.yml" - FLATPAK_MODULE: "nautilus" - RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" - APP_ID: "org.gnome.NautilusDevel" - extends: .flatpak - only: - - schedules - - web - - tags - allow_failure: true - style check: image: registry.gitlab.gnome.org/gnome/nautilus:latest stage: test diff --git a/build-aux/flatpak/org.gnome.NautilusMaster.yml b/build-aux/flatpak/org.gnome.NautilusMaster.yml deleted file mode 100644 index 7f5bc7c35..000000000 --- a/build-aux/flatpak/org.gnome.NautilusMaster.yml +++ /dev/null @@ -1,103 +0,0 @@ ---- -app-id: org.gnome.NautilusDevel -runtime: org.gnome.Platform -runtime-version: master -sdk: org.gnome.Sdk -command: nautilus -tags: -- devel -- development -- nightly -finish-args: -- "--share=ipc" -- "--socket=x11" -- "--socket=wayland" -- "--talk-name=org.gnome.OnlineAccounts" -- "--filesystem=host" -- "--talk-name=org.gtk.vfs" -- "--talk-name=org.gtk.vfs.*" -- "--filesystem=xdg-run/gvfsd" -- "--filesystem=xdg-run/dconf" -- "--filesystem=~/.config/dconf:ro" -- "--talk-name=ca.desrt.dconf" -- "--env=DCONF_USER_CONFIG_DIR=.config/dconf" -# Access to host Tracker Miners -- "--add-policy=Tracker3.dbus:org.freedesktop.Tracker3.Miner.Files=tracker:FileSystem;tracker:Documents" -modules: -- name: exiv2 - config-opts: - - "-DCMAKE_INSTALL_PREFIX=/app" - - "-DCMAKE_INSTALL_LIBDIR=/app/lib" - buildsystem: cmake-ninja - sources: - - type: git - url: https://github.com/Exiv2/exiv2.git - branch: 0.27-maintenance -- name: gexiv2 - buildsystem: meson - builddir: true - config-opts: - - "--libdir=/app/lib" - - "-Dintrospection=false" - - "-Dvapi=false" - - "-Dpython3=false" - - "-Dpython3_girdir=no" - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/gexiv2.git - branch: gexiv2-0.12 -- name: tracker-miners - buildsystem: meson - cleanup: - - "/etc" - - "/libexec/tracker-3" - - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Extract.service" - - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.service" - - "/share/dbus-1/services/org.freedesktop.Tracker3.Miner.Files.Control.service" - config-opts: - - "-Dextract=true" - - "-Dgeneric_media_extractor=none" - - "-Dman=false" - - "-Dminer_fs=true" - - "-Dminer_rss=false" - - "-Dsystemd_user_services=false" - - "-Dwriteback=false" - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/tracker-miners.git - branch: master -- name: gnome-desktop - buildsystem: meson - config-opts: - - "-Ddebug_tools=false" - - "-Ddesktop_docs=false" - - "-Dudev=disabled" - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/gnome-desktop.git -- name: gnome-autoar - buildsystem: meson - builddir: true - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/gnome-autoar.git -- name: libportal - buildsystem: meson - builddir: true - config-opts: - - "--libdir=/app/lib" - - "--buildtype=debugoptimized" - sources: - - type: git - url: https://github.com/flatpak/libportal.git -- buildsystem: meson - builddir: true - name: nautilus - config-opts: - - "--libdir=/app/lib" - - "-Dprofile=Devel" - - "-Dtests=all" - sources: - - type: git - url: https://gitlab.gnome.org/GNOME/nautilus.git - |