From 62af5130bde0b5c3400beb1050ff12622d3ca1e8 Mon Sep 17 00:00:00 2001 From: Jason Ross Date: Fri, 17 Oct 2025 12:39:26 -0500 Subject: [PATCH] Add status checks workflow to main --- .github/workflows/status-checks.yml | 236 +++++++++++++++------------- 1 file changed, 124 insertions(+), 112 deletions(-) diff --git a/.github/workflows/status-checks.yml b/.github/workflows/status-checks.yml index 4928195..53653cd 100644 --- a/.github/workflows/status-checks.yml +++ b/.github/workflows/status-checks.yml @@ -16,22 +16,64 @@ env: CI_CD: true jobs: - run-unit-tests-linux: + run-unit-tests-debian: runs-on: ubuntu-latest + permissions: + contents: read + packages: read + container: + image: ghcr.io/jmr-dev/android-file-handler-debian-builder:debian13-trixie + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.12' + - name: Install dependencies + run: | + poetry install --no-interaction - - name: Install Poetry - uses: snok/install-poetry@v1 + - name: Run tests + run: | + poetry run pytest tests/ -v + + run-unit-tests-arch: + runs-on: ubuntu-latest + permissions: + contents: read + packages: read + container: + image: ghcr.io/jmr-dev/android-file-handler-arch-builder:latest + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + steps: + - uses: actions/checkout@v4 - name: Install dependencies run: | - poetry install + poetry install --no-interaction + + - name: Run tests + run: | + poetry run pytest tests/ -v + + run-unit-tests-rhel: + runs-on: ubuntu-latest + permissions: + contents: read + packages: read + container: + image: ghcr.io/jmr-dev/android-file-handler-rhel-builder:fedora42 + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + steps: + - uses: actions/checkout@v4 + + - name: Install dependencies + run: | + poetry install --no-interaction - name: Run tests run: | @@ -45,7 +87,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - name: Install Poetry uses: snok/install-poetry@v1 @@ -70,16 +112,16 @@ jobs: poetry run pytest tests/ -v build-windows: - needs: [run-unit-tests-linux, run-unit-tests-windows] + needs: [run-unit-tests-windows] runs-on: windows-latest steps: - name: Checkout code uses: actions/checkout@v4 - - name: Set up Python 3.12 + - name: Set up Python 3.13 uses: actions/setup-python@v5 with: - python-version: '3.12' + python-version: '3.13' - name: Install Poetry uses: snok/install-poetry@v1 @@ -113,65 +155,35 @@ jobs: dist/android-file-handler.exe build-debian: - needs: [run-unit-tests-linux, run-unit-tests-windows] + needs: [run-unit-tests-debian, run-unit-tests-arch, run-unit-tests-rhel] + permissions: + contents: read + packages: read env: DISTRO_TYPE: debian runs-on: ubuntu-latest container: - image: python:3.12-slim + image: ghcr.io/jmr-dev/android-file-handler-debian-builder:debian13-trixie + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} 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 - - 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 @@ -184,7 +196,7 @@ jobs: fi fpm -s dir -t deb -n android-file-handler -v "$VERSION" \ - --architecture amd64 --prefix /usr/local/bin --deb-user root --deb-group root \ + --architecture amd64 --deb-user root --deb-group root \ --after-install scripts/debian_postinst.sh \ -p "dist/android-file-handler_${VERSION}_amd64.deb" -C "$PKG_DIR" "${PKG_ITEMS[@]}" @@ -197,72 +209,70 @@ jobs: pkg_dist_debian/** build-arch: - needs: [run-unit-tests-linux, run-unit-tests-windows] + needs: [run-unit-tests-debian, run-unit-tests-arch, run-unit-tests-rhel] + permissions: + contents: read + packages: read env: DISTRO_TYPE: arch runs-on: ubuntu-latest - container: - image: archlinux:latest 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 + uses: actions/checkout@v3 - - name: Set up Python 3.12 - uses: actions/setup-python@v5 + - name: Log in to GitHub Container Registry + uses: docker/login-action@v2 with: - python-version: '3.12' + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.CI_CD_PAT }} # Personal Access Token with read:packages + - - name: Install Poetry - uses: snok/install-poetry@v1 - with: - version: latest - virtualenvs-create: true - virtualenvs-in-project: true + - name: Pull Docker image + run: docker pull ghcr.io/jmr-dev/android-file-handler-arch-builder:latest - - name: Configure Poetry + - name: Build executable inside container run: | - echo 'export PATH="$HOME/bin:$PATH"' >> $GITHUB_ENV - export PATH="$HOME/bin:$PATH" + docker run --rm \ + -v ${{ github.workspace }}:/workspace \ + -w /workspace \ + -e DISTRO_TYPE=${{ env.DISTRO_TYPE }} \ + -e FPM_VERSION=${{ env.FPM_VERSION }} \ + -e CI_CD=${{ env.CI_CD }} \ + ghcr.io/jmr-dev/android-file-handler-arch-builder:latest \ + sh -c "poetry install --no-interaction && poetry run python scripts/build_package_linux.py" - - name: Install dependencies & build executable + - name: Package pacman (fpm) inside container run: | - export PATH="$HOME/bin:/usr/bin:$PATH" - # Use unified build script to produce pkg_dist_arch layout via Poetry - 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 - echo "Packaging from $PKG_DIR" - ls -la "$PKG_DIR" || true - - ICON_PATH="$PKG_DIR/usr/share/icons/hicolor/256x256/apps/android-file-handler.png" - PKG_ITEMS=( "usr/bin/android-file-handler" "usr/share/applications/android-file-handler.desktop" ) - if [ -f "$ICON_PATH" ]; then - PKG_ITEMS+=( "usr/share/icons/hicolor/256x256/apps/android-file-handler.png" ) - else - echo "Note: icon not present, packaging without icon" - fi - - fpm -s dir -t pacman -n android-file-handler -v "$VERSION" \ - --architecture x86_64 --prefix /usr/bin \ - -p "dist/android-file-handler-${VERSION}-1-x86_64.pkg.tar.zst" -C "$PKG_DIR" "${PKG_ITEMS[@]}" + docker run --rm \ + -v ${{ github.workspace }}:/workspace \ + -w /workspace \ + -e FPM_VERSION=${{ env.FPM_VERSION }} \ + ghcr.io/jmr-dev/android-file-handler-arch-builder:latest \ + sh -c 'set -euo pipefail && \ + VERSION="$(poetry version -s)" && \ + PKG_DIR="pkg_dist_arch" && \ + mkdir -p dist && \ + echo "Packaging from $PKG_DIR" && \ + ls -la "$PKG_DIR" || true && \ + ICON_PATH="$PKG_DIR/usr/share/icons/hicolor/256x256/apps/android-file-handler.png" && \ + if [ -f "$ICON_PATH" ]; then \ + fpm -s dir -t pacman -n android-file-handler -v "$VERSION" \ + --architecture x86_64 \ + -p "dist/android-file-handler-${VERSION}-1-x86_64.pkg.tar.zst" \ + -C "$PKG_DIR" \ + "usr/bin/android-file-handler" \ + "usr/share/applications/android-file-handler.desktop" \ + "usr/share/icons/hicolor/256x256/apps/android-file-handler.png"; \ + else \ + echo "Note: icon not present, packaging without icon" && \ + fpm -s dir -t pacman -n android-file-handler -v "$VERSION" \ + --architecture x86_64 \ + -p "dist/android-file-handler-${VERSION}-1-x86_64.pkg.tar.zst" \ + -C "$PKG_DIR" \ + "usr/bin/android-file-handler" \ + "usr/share/applications/android-file-handler.desktop"; \ + fi' - name: Upload Arch package uses: actions/upload-artifact@v4 @@ -273,7 +283,7 @@ jobs: pkg_dist_arch/** build-rhel: - needs: [run-unit-tests-linux, run-unit-tests-windows] + needs: [run-unit-tests-debian, run-unit-tests-arch, run-unit-tests-rhel] permissions: contents: read packages: read @@ -281,7 +291,10 @@ 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 + credentials: + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} steps: - name: Checkout code uses: actions/checkout@v4 @@ -289,8 +302,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