[deploy] Fix deploy failing
Some checks failed
build & deploy / test (push) Successful in 1m57s
build & deploy / build-and-deploy (push) Failing after 16s

This commit is contained in:
2026-05-01 16:57:51 -04:00
parent cbdb5c49d0
commit b1d6f4726b
2 changed files with 12 additions and 8 deletions

View File

@ -90,13 +90,18 @@ jobs:
python -m pip install --upgrade pip
pip install poetry
- name: Write commit hash
- name: Write commit hash to build file
run: |
echo "commit = '${{ gitea.sha }}'" > vrobbler/_commit.py
mkdir -p build_meta
echo "${{ gitea.sha }}" > build_meta/commit.txt
- name: Build package
- name: Build package with commit info
run: |
# Write commit to _commit.py before build
echo "commit = '${{ gitea.sha }}'" > vrobbler/_commit.py
poetry build
# Restore original _commit.py
git checkout vrobbler/_commit.py
- name: Copy wheel to server and deploy
uses: appleboy/ssh-action@v1.0.3
@ -106,9 +111,6 @@ jobs:
key: ${{ secrets.JAIL_KEY }}
command_timeout: 2m
script: |
TMP_DIR=$(mktemp -d)
# The wheel file needs to be copied first - we'll use scp outside this
# For now, let's write the commit hash to a file on the server
mkdir -p /var/lib/vrobbler
echo "${{ gitea.sha }}" > /var/lib/vrobbler/commit.txt
pip uninstall -y vrobbler

View File

@ -58,8 +58,10 @@ class TestVersionInfo:
result = version_info(mock_request)
# Should use the value from vrobbler/_commit.py
assert result["git_commit"] == "unknown"
# Should use whatever value is in vrobbler/_commit.py
# Could be "unknown" or an actual commit hash
assert "git_commit" in result
assert result["git_commit"] != ""
def test_uses_commit_from_file_when_module_unavailable(self, mock_request):
"""Test that commit from /var/lib/vrobbler/commit.txt is used"""