From 19589c9463ba73e97a6d6cfdb2d62c0cac18c9b0 Mon Sep 17 00:00:00 2001 From: Colin Powell Date: Mon, 1 Jun 2026 10:35:10 -0400 Subject: [PATCH] [tooling] Fix failing deploys --- .gitea/workflows/deploy.yml | 2 +- PROJECT.org | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index ffbe7c0..21fae92 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -116,9 +116,9 @@ jobs: mkdir -p /var/lib/vrobbler echo "${{ gitea.sha }}" | cut -c1-8 > /var/lib/vrobbler/commit.txt pip uninstall -y vrobbler + rm -f /var/lib/vrobbler/dist/*.whl pip install /var/lib/vrobbler/dist/*.whl python -c "import vrobbler; print(f'vrobbler {vrobbler.__version__} installed OK')" - rm -f /var/lib/vrobbler/dist/*.whl vrobbler migrate vrobbler collectstatic --noinput immortalctl restart vrobbler-celery && immortalctl restart vrobbler-celerybeat && immortalctl restart vrobbler diff --git a/PROJECT.org b/PROJECT.org index 836dada..3a68da9 100644 --- a/PROJECT.org +++ b/PROJECT.org @@ -489,6 +489,25 @@ whatever time KoReader reports, we need to know, given the date and the user profile's historic timezone, how many hours to adjust the KoReader time to get to GMT to save it in the database. +** DONE [#A] Issue found when doing a release :bug:tooling:release:cicd: +:PROPERTIES: +:ID: a8fc3ec9-74ec-4190-8ac2-62cd8a33e828 +:END: + +*** Description +#+begin_src sh +err: ERROR: Cannot install vrobbler 0.16.1 (from /var/lib/vrobbler/dist/vrobbler-0.16.1-py3-none-any.whl) and vrobbler 38.0 (from /var/lib/vrobbler/dist/vrobbler-38.0-py3-none-any.whl) because these package versions have conflicting dependencies. +out: The conflict is caused by: +out: The user requested vrobbler 0.16.1 (from /var/lib/vrobbler/dist/vrobbler-0.16.1-py3-none-any.whl) +out: The user requested vrobbler 38.0 (from /var/lib/vrobbler/dist/vrobbler-38.0-py3-none-any.whl) +out: To fix this you could try to: +out: 1. loosen the range of package versions you've specified +out: 2. remove package versions to allow pip attempt to solve the dependency conflict +err: ERROR: ResolutionImpossible: for help visit https://pip.pypa.io/en/latest/topics/dependency-resolution/#dealing-with-dependency-conflicts +2026/06/01 14:15:00 Process exited with status 1 +failed to remove container: Error response from daemon: removal of container 3fe0eaf032c5518aca4ab71734b52bda7c54ed406136b82136ab7155bf5ff3c1 is already in progress +#+end_src + ** DONE [#A] Fix deploy actions running twice :bug:tooling:cicd: :PROPERTIES: :ID: aa56f2a6-2b61-4ddf-9e27-9eadcddf8412