diff --git a/.builds/build-flatpak.yml b/.builds/build-flatpak.yml new file mode 100644 index 0000000..8b5eabe --- /dev/null +++ b/.builds/build-flatpak.yml @@ -0,0 +1,22 @@ +image: archlinux +packages: + - dbus + - gobject-introspection + - gtk3 + - mpv + - python-cairo + - python-gobject + - python-poetry + - xorg-server-xvfb +sources: + - https://git.sr.ht/~sumner/sublime-music +environment: + REPO_NAME: sublime-music +# triggers: +# - action: email +# condition: failure +# to: ~sumner/sublime-music-devel@lists.sr.ht +tasks: + - build-flatpak: | + cd ${REPO_NAME}/flatpak + REPO=repo ./flatpak_build.sh diff --git a/.builds/build.yml b/.builds/build.yml index cf7e874..1b64c0b 100644 --- a/.builds/build.yml +++ b/.builds/build.yml @@ -38,10 +38,6 @@ tasks: - build: | python setup.py sdist - - build-flatpak: | - cd ${REPO_NAME}/flatpak - # REPO=repo ./flatpak_build.sh - - deploy-pypi: | ./cicd/run_if_tagged_with_version \ "twine upload -r testpypi dist/*" \ diff --git a/.gitignore b/.gitignore index 0e46bbe..dfdcb48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ flatpak/flatpak_build_dir/ flatpak/sublime-music.flatpak +flatpak/repo # Created by https://www.gitignore.io/api/python # Edit at https://www.gitignore.io/?templates=python diff --git a/cicd/install-project-deps.sh b/cicd/install-project-deps.sh index 164ad21..6e1612f 100755 --- a/cicd/install-project-deps.sh +++ b/cicd/install-project-deps.sh @@ -8,4 +8,4 @@ pip3 install poetry mkdir -p ~/.config/pypoetry/ echo "[virtualenvs]" > ~/.config/pypoetry/config.toml echo "in-project = true" >> ~/.config/pypoetry/config.toml -poetry install --dev +poetry install diff --git a/flatpak/app.sublimemusic.SublimeMusic.json b/flatpak/app.sublimemusic.SublimeMusic.json index 98b2fac..0917762 100644 --- a/flatpak/app.sublimemusic.SublimeMusic.json +++ b/flatpak/app.sublimemusic.SublimeMusic.json @@ -67,6 +67,9 @@ "build-commands": [ "pip3 install --prefix=/app ." ], + "build-options": { + "build-args": [ "--share=network" ] + }, "sources": [ { "type": "dir", diff --git a/sublime-music.metainfo.xml b/sublime-music.metainfo.xml index 5af2160..6bc17d2 100644 --- a/sublime-music.metainfo.xml +++ b/sublime-music.metainfo.xml @@ -89,7 +89,8 @@ me_AT_sumnerevans.com - + +