From 37d693d553ffbed3b18c9ac67701b960dc3780b0 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Sat, 19 Sep 2020 00:36:35 -0600 Subject: [PATCH] Add deps --- .builds/flatpak.yml | 3 ++- .builds/gitlab-mirror-and-readme.yml | 2 +- .builds/lint-test.yml | 6 ++++-- .builds/pypi.yml | 11 ++++++----- cicd/run_if_tagged_with_version | 2 +- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.builds/flatpak.yml b/.builds/flatpak.yml index d4a3aa4..3e97f01 100644 --- a/.builds/flatpak.yml +++ b/.builds/flatpak.yml @@ -2,8 +2,9 @@ image: archlinux packages: - flatpak - flatpak-builder + - python-pip sources: - - https://git.sr.ht/~sumner/offlinemsmtp + - https://git.sr.ht/~sumner/sublime-music environment: REPO_NAME: sublime-music # triggers: diff --git a/.builds/gitlab-mirror-and-readme.yml b/.builds/gitlab-mirror-and-readme.yml index 2d3d130..e723e32 100644 --- a/.builds/gitlab-mirror-and-readme.yml +++ b/.builds/gitlab-mirror-and-readme.yml @@ -5,7 +5,7 @@ packages: - openssh - py3-docutils sources: - - https://git.sr.ht/~sumner/offlinemsmtp + - https://git.sr.ht/~sumner/sublime-music secrets: # README Personal Access Token - 2fb5fd72-fa96-46c6-ab90-6b7cabebba16 diff --git a/.builds/lint-test.yml b/.builds/lint-test.yml index 448e543..e66dc5f 100644 --- a/.builds/lint-test.yml +++ b/.builds/lint-test.yml @@ -1,10 +1,13 @@ image: archlinux packages: - dbus + - gobject-introspection + - python-cairo + - python-gobject - python-poetry - xorg-server-xvfb sources: - - https://git.sr.ht/~sumner/offlinemsmtp + - https://git.sr.ht/~sumner/sublime-music environment: REPO_NAME: sublime-music # triggers: @@ -26,7 +29,6 @@ tasks: cicd/custom_style_check.py - test: | - ./cicd/start-dbus.sh Xvfb :119 -screen 0 1024x768x16 & export DISPLAY=:119 ./cicd/pytest.sh diff --git a/.builds/pypi.yml b/.builds/pypi.yml index 04adcab..cfe3391 100644 --- a/.builds/pypi.yml +++ b/.builds/pypi.yml @@ -1,9 +1,10 @@ -image: archlinux +image: alpine/edge packages: - - python - - xorg-server-xvfb + - py3-pip + - py3-setuptools + - py3-twine sources: - - https://git.sr.ht/~sumner/offlinemsmtp + - https://git.sr.ht/~sumner/sublime-music environment: REPO_NAME: sublime-music # triggers: @@ -16,7 +17,7 @@ tasks: echo "cd ${REPO_NAME}" >> ~/.buildenv - build: | - python setup.py sdist + python3 setup.py sdist - deploy-pypi: | ./cicd/run_if_tagged_with_version \ diff --git a/cicd/run_if_tagged_with_version b/cicd/run_if_tagged_with_version index e6a91d0..d17c6a8 100755 --- a/cicd/run_if_tagged_with_version +++ b/cicd/run_if_tagged_with_version @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/env python3 import re import subprocess