diff options
| author | Carlos Soriano <csoriano1618@gmail.com> | 2018-03-19 08:27:47 +0000 |
|---|---|---|
| committer | Carlos Soriano <csoriano1618@gmail.com> | 2018-03-19 08:27:47 +0000 |
| commit | 7324e2440db6960fb1a27a58fa6e0ae5b94781c2 (patch) | |
| tree | 4136ead052e002e5a1a142215023f003ff38f513 | |
| parent | fec5754f6be7032847c1822bb7d8ff9e1dfc15ab (diff) | |
| parent | 77417cf0a5837d636aac0d5d3003dd593c631fa9 (diff) | |
| download | nautilus-7324e2440db6960fb1a27a58fa6e0ae5b94781c2.tar.gz | |
Merge branch 'flatpak-master' into 'master'
Flatpak gnome nightly and artifact fix
See merge request GNOME/nautilus!154
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rw-r--r-- | build-aux/flatpak/org.gnome.NautilusDevel.json | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4e3d6629..f3bb3f1ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,7 +12,7 @@ stages: - ninja test flatpak:master: - image: flatpak/flatpak-builder:gnome-3-28 + image: registry.gitlab.com/alatiera/gnome-nightly-oci/gnome-master:latest stage: test script: - flatpak-builder --stop-at=nautilus app build-aux/flatpak/org.gnome.NautilusDevel.json @@ -25,13 +25,10 @@ flatpak:master: - flatpak-builder --run app build-aux/flatpak/org.gnome.NautilusDevel.json ninja -C _build test artifacts: paths: - - nautilus-dev.flatpak - expire_in: 2 days - artifacts: - when: on_failure - paths: + - nautilus-dev.flatpak - _build/meson-logs/meson-log.txt - _build/meson-logs/testslog.txt + expire_in: 2 days cache: paths: diff --git a/build-aux/flatpak/org.gnome.NautilusDevel.json b/build-aux/flatpak/org.gnome.NautilusDevel.json index a53f619e6..b0424ec18 100644 --- a/build-aux/flatpak/org.gnome.NautilusDevel.json +++ b/build-aux/flatpak/org.gnome.NautilusDevel.json @@ -1,7 +1,7 @@ { "app-id": "org.gnome.NautilusDevel", "runtime": "org.gnome.Platform", - "runtime-version": "3.28", + "runtime-version": "master", "sdk": "org.gnome.Sdk", "command": "nautilus", "tags": ["devel", "development", "nightly"], |