* Updated release workflow to test all distros, use pre-built images, and removed redundant env set up steps

* Updated status checks to mirror release workflow process
* Return type annotations added to build script for better linting/erroring
This commit is contained in:
2025-10-16 18:51:32 -05:00
committed by Jason Ross
parent 8d7e5a53fd
commit 7fcd5108eb
3 changed files with 63 additions and 168 deletions
+10 -76
View File
@@ -449,62 +449,26 @@ jobs:
DISTRO_TYPE: debian
runs-on: ubuntu-latest
container:
image: python:3.12-slim
image: ghcr.io/jmr-dev/android-file-handler-debian-builder
steps:
- name: Install system dependencies & gem fpm (include Tcl/Tk)
run: |
set -euo pipefail
apt-get update
# Install Tcl/Tk runtimes, dev headers and common X libraries required by tkinter
apt-get install -y --no-install-recommends \
curl git build-essential ruby ruby-dev gcc make zlib1g-dev ca-certificates python3-tk \
tcl8.6 tk8.6 tcl8.6-dev tk8.6-dev libx11-6 libxext6 libxrender1 libxcb1
# install pinned fpm to the system gem dir (will be available under gem env's EXECUTABLE DIRECTORY or /usr/local/bin)
gem install --no-document -v "${FPM_VERSION}" fpm
- name: Checkout code
uses: actions/checkout@v4
with:
ref: main
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Install Poetry
uses: snok/install-poetry@v1
with:
version: latest
virtualenvs-create: true
virtualenvs-in-project: true
- name: Configure Poetry
- name: Build executable
run: |
echo 'export PATH="$HOME/.local/bin:$PATH"' >> $GITHUB_ENV
export PATH="$HOME/.local/bin:$PATH"
poetry config virtualenvs.create true
poetry config virtualenvs.in-project true
- name: Install dependencies & build executable
run: |
export PATH="$HOME/.local/bin:$PATH"
poetry env use python3.12 || true
# Debug: show tkinter/_tkinter and Tcl library discovery in the Poetry venv
poetry run python -c 'import tkinter, _tkinter, sys; print("tkinter=", getattr(tkinter, "__file__", None)); print("_tkinter=", getattr(_tkinter, "__file__", None)); import tkinter as tk; print("TCL_LIBRARY=", tk.Tcl().eval("info library"))'
# Build distro-specific package layout using the build script via Poetry
# Container has Poetry and all dependencies pre-installed
poetry install --no-interaction
poetry run python scripts/build_package_linux.py
- name: Package .deb (fpm)
shell: bash
run: |
set -euo pipefail
export PATH="$HOME/.local/bin:$PATH"
VERSION="$(poetry version -s)"
PKG_DIR="pkg_dist_debian"
mkdir -p dist
# Debug listing
echo "Packaging from $PKG_DIR"
ls -la "$PKG_DIR" || true
@@ -536,52 +500,23 @@ jobs:
DISTRO_TYPE: arch
runs-on: ubuntu-latest
container:
image: archlinux:latest
image: ghcr.io/jmr-dev/android-file-handler-arch-builder
steps:
- name: Install system dependencies (Arch) and system Ruby
run: |
set -euo pipefail
pacman -Syu --noconfirm
pacman -S --noconfirm ruby base-devel curl git tar ca-certificates tk tcl libx11 libxext libxrender libxcb
# Install fpm system-wide and pin version so fpm will be in /usr/in
gem install --no-document erb
gem install --no-document -v "${FPM_VERSION}" fpm --bindir /usr/bin
# persist system bindir to subsequent steps (usually already on PATH)
echo "/usr/local/bin" >> $GITHUB_PATH
- name: Checkout code
uses: actions/checkout@v4
with:
ref: main
- name: Set up Python 3.12
uses: actions/setup-python@v5
with:
python-version: '3.12'
- name: Install Poetry
uses: snok/install-poetry@v1
with:
version: latest
virtualenvs-create: true
virtualenvs-in-project: true
- name: Configure Poetry
- name: Build executable
run: |
echo 'export PATH="$HOME/bin:$PATH"' >> $GITHUB_ENV
export PATH="$HOME/bin:$PATH"
- name: Install dependencies & build executable
run: |
export PATH="$HOME/bin:/usr/bin:$PATH"
# Use unified build script to produce pkg_dist_arch layout via Poetry
# Container has Poetry and all dependencies pre-installed
poetry install --no-interaction
poetry run python scripts/build_package_linux.py
- name: Package pacman (fpm)
shell: bash
run: |
set -euo pipefail
export PATH="$HOME/.local/bin:/usr/bin:$PATH"
VERSION="$(poetry version -s)"
PKG_DIR="pkg_dist_arch"
mkdir -p dist
@@ -619,7 +554,7 @@ jobs:
DISTRO_TYPE: rhel
runs-on: ubuntu-latest
container:
image: ghcr.io/jmr-dev/android-file-handler-adb:v0.1.0
image: ghcr.io/jmr-dev/android-file-handler-rhel-builder:fedora42
steps:
- name: Checkout code
uses: actions/checkout@v4
@@ -629,8 +564,7 @@ jobs:
- name: Build RHEL package
run: |
set -euo pipefail
export CI_CD=true
export DISTRO_TYPE=rhel
# Container has Poetry and all dependencies pre-installed
poetry install --no-interaction
poetry run python scripts/build_package_linux.py