Commit 9a0779d2 authored by Michael Terry's avatar Michael Terry

Update flatpak dependencies

Point at latest releases via git URLs with tags, because it's easier
to update than tarballs with checksums.

And update to GNOME 3.30 from 3.28 for the base image.

Additionally:
- Update gitignore syntax to be tighter
- Have tests/shell return the status code of the run command
parent 01ca1224
Pipeline #53974 passed with stage
in 10 minutes and 12 seconds
.buildconfig
.cache
builddir
debian
flatpak/.flatpak-builder
prime
snap/.snapcraft
stage
tests/config.ini
tests/data
*.snap
\ No newline at end of file
/.buildconfig
/.cache/
/builddir/
/debian/
/flatpak/.flatpak-builder
/prime/
/snap/.snapcraft
/stage/
/tests/config.ini
/tests/data/
/*.snap
__pycache__/
......@@ -5,7 +5,7 @@ variables:
flatpak:
extends: .flatpak
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.28
image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.30
variables:
MANIFEST_PATH: "flatpak/org.gnome.DejaDupDevel.yaml"
MESON_ARGS: "-Dprofile=Devel"
......
......@@ -2,7 +2,7 @@
---
app-id: org.gnome.DejaDupDevel
runtime: org.gnome.Platform
runtime-version: '3.28'
runtime-version: '3.30'
sdk: org.gnome.Sdk
command: deja-dup
......@@ -36,31 +36,28 @@ modules:
tag: 0.8.1
- name: gnome-online-accounts
config-opts:
- --disable-telepathy
- --disable-documentation
- --disable-gtk-doc
buildsystem: meson
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/gnome-online-accounts.git
tag: 3.28.0
tag: 3.30.1
- name: libgpg-error
config-opts:
- --disable-doc
sources:
- type: archive
url: https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.27.tar.bz2
sha256: 4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
- type: git
url: https://dev.gnupg.org/source/libgpg-error.git
tag: libgpg-error-1.34
- name: librsync
config-opts:
- --enable-shared
- --disable-static
buildsystem: cmake
sources:
- type: archive
url: https://downloads.sourceforge.net/project/librsync/librsync/0.9.7/librsync-0.9.7.tar.gz
sha256: 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6
- type: git
url: https://github.com/librsync/librsync
tag: v2.0.2
- name: python-six
buildsystem: simple
......@@ -68,9 +65,9 @@ modules:
- python2 setup.py build
- python2 setup.py install --single-version-externally-managed --root=/ --prefix /app
sources:
- type: archive
url: https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-1.10.0.tar.gz
sha256: 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a
- type: git
url: https://github.com/benjaminp/six
tag: 1.12.0
- name: python-monotonic
buildsystem: simple
......@@ -78,9 +75,9 @@ modules:
- python2 setup.py build
- python2 setup.py install --single-version-externally-managed --root=/ --prefix /app
sources:
- type: archive
url: https://pypi.python.org/packages/96/b3/3e9fa0bdf132a971571cbf0e3f0c8b38834f4f7af8ca9523794f4f5895e0/monotonic-1.3.tar.gz
sha256: 2b469e2d7dd403f7f7f79227fe5ad551ee1e76f8bb300ae935209884b93c7c1b
- type: git
url: https://github.com/atdt/monotonic
tag: '1.5'
- name: python-fasteners
buildsystem: simple
......@@ -88,9 +85,9 @@ modules:
- python2 setup.py build
- python2 setup.py install --single-version-externally-managed --root=/ --prefix /app
sources:
- type: archive
url: https://pypi.python.org/packages/f4/6f/41b835c9bf69b03615630f8a6f6d45dafbec95eb4e2bb816638f043552b2/fasteners-0.14.1.tar.gz
sha256: 427c76773fe036ddfa41e57d89086ea03111bbac57c55fc55f3006d027107e18
- type: git
url: https://github.com/harlowja/fasteners
tag: 0.14.1
- name: duplicity
buildsystem: simple
......@@ -99,30 +96,40 @@ modules:
- python2 setup.py install --prefix /app
sources:
- type: archive
url: https://launchpad.net/duplicity/0.7-series/0.7.14/+download/duplicity-0.7.14.tar.gz
sha256: 7a3eb74a2a36b004b10add2970b37cfbac0bd693d79513e6311c8e4b8c3dd73e
url: https://launchpad.net/duplicity/0.7-series/0.7.18.2/+download/duplicity-0.7.18.2.tar.gz
md5: a5d16cc0a95f0fd2bb309cd0b8015945
- name: python-boto
- name: pycairo
buildsystem: simple
build-commands:
- python2 setup.py build
- python2 setup.py install --single-version-externally-managed --root=/ --prefix /app
sources:
- type: archive
url: https://pypi.python.org/packages/66/e7/fe1db6a5ed53831b53b8a6695a8f134a58833cadb5f2740802bc3730ac15/boto-2.48.0.tar.gz
sha256: deb8925b734b109679e3de65856018996338758f4b916ff4fe7bb62b6d7000d1
- type: git
url: https://github.com/pygobject/pycairo
tag: v1.18.0
- name: pygobject
buildsystem: simple
build-commands:
- python2 setup.py build
- python2 setup.py install --single-version-externally-managed --root=/ --prefix /app
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/pygobject/
tag: 3.30.4
- name: python-cloudfiles
- name: python-boto
buildsystem: simple
build-commands:
- python2 setup.py build
- python2 setup.py install --single-version-externally-managed --root=/ --prefix /app
sources:
- type: archive
url: https://pypi.python.org/packages/b5/6d/11d1166c0d1a48eb15daf1b6c748e99c057ebac92e38fa0c19bdad2bc6a0/python-cloudfiles-1.7.11.tar.gz
sha256: 13039dd639e4686be020847b932e7a921a7a5b018c855c58190f7bfb48091335
- type: git
url: https://github.com/boto/boto
tag: 2.49.0
- name: python-pbr
......@@ -131,9 +138,9 @@ modules:
- python2 setup.py build
- python2 setup.py install --prefix /app
sources:
- type: archive
url: https://pypi.python.org/packages/d5/d6/f2bf137d71e4f213b575faa9eb426a8775732432edb67588a8ee836ecb80/pbr-3.1.1.tar.gz
sha256: 05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1
- type: git
url: https://github.com/openstack-dev/pbr
tag: 5.1.1
- name: python-certifi
buildsystem: simple
......@@ -141,9 +148,9 @@ modules:
- python2 setup.py build
- python2 setup.py install --single-version-externally-managed --root=/ --prefix /app
sources:
- type: archive
url: https://pypi.python.org/packages/20/d0/3f7a84b0c5b89e94abbd073a5f00c7176089f526edb056686751d5064cbd/certifi-2017.7.27.1.tar.gz
sha256: 40523d2efb60523e113b44602298f0960e900388cf3bb6043f645cf57ea9e3f5
- type: git
url: https://github.com/certifi/python-certifi
tag: 2018.11.29
- name: python-requests
buildsystem: simple
......@@ -161,9 +168,50 @@ modules:
- python2 setup.py build
- python2 setup.py install --prefix /app
sources:
- type: archive
url: https://pypi.python.org/packages/9a/a7/fa2e2def232d0c8b32677399f0381e3e6e602ce577e138fff57771a0b9e7/python-swiftclient-3.4.0.tar.gz
sha256: 54f7ae339bd076e295dd576ec98e55ba71205ee7e62964b27c8ec80c9351067d
- type: git
url: https://github.com/openstack/python-swiftclient
tag: 3.6.0
- name: setuptools-scm
buildsystem: simple
build-commands:
- python2 setup.py build
- python2 setup.py install --single-version-externally-managed --root=/ --prefix /app
sources:
- type: git
url: https://github.com/pypa/setuptools_scm
tag: v3.2.0
- name: mock
buildsystem: simple
build-commands:
- python2 setup.py build
- python2 setup.py install --prefix /app
sources:
- type: git
url: https://github.com/testing-cabal/mock
tag: 2.0.0
- name: keyring
buildsystem: simple
build-commands:
- python2 setup.py build
- python2 setup.py install --single-version-externally-managed --root=/ --prefix /app
sources:
- type: git
url: https://github.com/jaraco/keyring
tag: 15.2.0
- name: pyrax
buildsystem: simple
build-commands:
- python2 setup.py build
- python2 setup.py install --single-version-externally-managed --root=/ --prefix /app
sources:
- type: git
url: https://github.com/pycontribs/pyrax
tag: v1.9.8
- name: deja-dup
......
......@@ -59,6 +59,9 @@ run_shell()
fi
if sh -c "$CMD"; then
rm -rf "${ROOTDIR}" # Cleanup on clean exit
exit 0
else
exit $?
fi
}
......@@ -72,7 +75,6 @@ if [ "$SHNAME" = "shell" ]; then
export PATH="${BUILDDIR}/deja-dup/monitor:${BUILDDIR}/deja-dup:${PATH}"
run_shell "sh $ROOTDIR/runscript.sh"
exit
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment