Skip to content

Commit

Permalink
Revert requirements & github action changes
Browse files Browse the repository at this point in the history
  • Loading branch information
JourneyOver committed Dec 30, 2024
1 parent 8c53ce8 commit a09c033
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ __pycache__/

# Ignore configuration and script files
.gitignore
renovate.json
settings.json
healthcheck.exitstate
healthcheck.connectionerror
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/dev-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
workflow_dispatch:

env:
PYTHON_VERSION: '3.13.1'
PYTHON_VERSION: '3.10'

jobs:
validate:
Expand All @@ -20,10 +20,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@main
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@main
uses: actions/setup-python@v5
with:
python-version: ${{env.PYTHON_VERSION}}

Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:

linux-pyinstaller:
name: Linux (PyInstaller)
runs-on: ubuntu-24.04
runs-on: ubuntu-20.04
needs:
- validate

Expand All @@ -124,8 +124,9 @@ jobs:
run: |
sed -ri "s/^__version__\s*=\s*\"[^\"]+/\0.${{steps.vars.outputs.sha_short}}/" version.py
# NOTE: We're only use a custom version of Python here because truststore requires at least Python 3.10, but Ubuntu 20.04 has Python 3.8.
- name: Set up Python
uses: actions/setup-python@main
uses: actions/setup-python@v5
with:
python-version: ${{env.PYTHON_VERSION}}

Expand All @@ -143,6 +144,7 @@ jobs:
run: |
python3 -m pip install pyinstaller
# NOTE: Remove this step if/once libxft gets updated to 2.3.5 or newer on Ubuntu 20.04, which currently has 2.3.3.
- name: Build a recent version of libXft
run: |
mkdir -p /tmp/libXft
Expand Down Expand Up @@ -178,7 +180,7 @@ jobs:

linux-appimage:
name: Linux (AppImage)
runs-on: ubuntu-24.04
runs-on: ubuntu-22.04
needs:
- validate

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
aiohttp>=3.11.11,<4.0
aiohttp>=3.9,<4.0
Pillow
pystray
PyGObject; sys_platform == "linux" # required for better system tray support on Linux
Expand Down

0 comments on commit a09c033

Please sign in to comment.