From 94b439cc390020d1b65323f72f3773a199f907c7 Mon Sep 17 00:00:00 2001 From: Alejandro Mora Date: Thu, 23 Apr 2026 14:00:39 -0400 Subject: [PATCH] ci(release): Debian codename APT suites and stable bookworm alias - Build .deb in debian:bookworm and debian:trixie per arch; artifact deb-- - reprepro: bookworm, trixie, stable (stable duplicates bookworm for old sources.list) - setup.sh/setup-apt.sh: VERSION_CODENAME; bookworm|trixie only; ship setup.sh copy - Release job: flatten artifacts so bookworm/trixie .deb names do not collide - Verify dists for bookworm, trixie, stable; docs + gh-pages apt blurb --- .github/workflows/release.yaml | 130 +++++++++++++++++++++++++++++---- docs/software-setup.rst | 21 +++++- gh-pages/index.html | 5 +- 3 files changed, 139 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index bb2c14ad..cdd5212f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,11 +18,23 @@ jobs: strategy: matrix: include: - - arch: amd64 + - codename: bookworm + arch: amd64 docker_platform: linux/amd64 - - arch: arm64 + - codename: bookworm + arch: arm64 docker_platform: linux/arm64 - - arch: armhf + - codename: bookworm + arch: armhf + docker_platform: linux/arm/v7 + - codename: trixie + arch: amd64 + docker_platform: linux/amd64 + - codename: trixie + arch: arm64 + docker_platform: linux/arm64 + - codename: trixie + arch: armhf docker_platform: linux/arm/v7 steps: @@ -42,7 +54,7 @@ jobs: run: | docker run --rm --platform ${{ matrix.docker_platform }} \ -v "$PWD":/src -w /src \ - debian:bookworm bash -c ' + debian:${{ matrix.codename }} bash -c ' set -e export DEBIAN_FRONTEND=noninteractive @@ -92,7 +104,7 @@ jobs: - name: Upload .deb artifact uses: actions/upload-artifact@v4 with: - name: deb-${{ matrix.arch }} + name: deb-${{ matrix.codename }}-${{ matrix.arch }} path: output/*.deb build-rpm: @@ -225,8 +237,29 @@ jobs: uses: actions/download-artifact@v4 with: pattern: "{deb-*,rpm-*}" - path: packages - merge-multiple: true + path: packages-raw + merge-multiple: false + + - name: Flatten packages for release (unique .deb names per codename) + run: | + set -e + mkdir -p packages + shopt -s nullglob + rpms=(packages-raw/rpm-*/*.rpm) + debs=(packages-raw/deb-*/*.deb) + if [ "${#debs[@]}" -eq 0 ]; then + echo "ERROR: no .deb under packages-raw/deb-*" >&2 + ls -laR packages-raw || true + exit 1 + fi + for rpm in "${rpms[@]}"; do + [ -f "$rpm" ] && cp "$rpm" packages/ + done + for deb in "${debs[@]}"; do + artifact_dir=$(basename "$(dirname "$deb")") + cp "$deb" "packages/${artifact_dir}_$(basename "$deb")" + done + ls -la packages - name: Create GitHub Release uses: softprops/action-gh-release@v2 @@ -259,7 +292,7 @@ jobs: with: pattern: deb-* path: incoming-deb - merge-multiple: true + merge-multiple: false - name: Download rpm artifacts uses: actions/download-artifact@v4 @@ -298,21 +331,74 @@ jobs: run: | mkdir -p conf cat > conf/distributions <&2 + ls -la incoming-deb || true + exit 1 + fi + for debdir in "${debdirs[@]}"; do + [ -d "$debdir" ] || continue + base=$(basename "$debdir") + rest="${base#deb-}" + arch="${rest##*-}" + codename="${rest%-$arch}" + case "$codename" in bookworm|trixie) ;; *) + echo "ERROR: unexpected artifact directory name: $base (expected deb--)" >&2 + exit 1 + ;; esac + for deb in "$debdir"/*.deb; do + [ -f "$deb" ] || continue + echo "Including $deb into suite $codename" + reprepro includedeb "$codename" "$deb" + if [ "$codename" = bookworm ]; then + echo "Including $deb into suite stable (bookworm-compatible legacy alias)" + reprepro includedeb stable "$deb" + fi + done done + - name: Verify APT repo layout + run: | + set -e + for codename in bookworm trixie stable; do + for arch in amd64 arm64 armhf; do + pkg="dists/${codename}/main/binary-${arch}/Packages" + test -f "$pkg" || { echo "ERROR: missing $pkg"; exit 1; } + grep -q '^Package: mariner3d$' "$pkg" || { echo "ERROR: mariner3d not listed in $pkg"; exit 1; } + done + done + echo "APT layout OK: bookworm, trixie, stable (bookworm alias), all architectures." + - name: Create YUM/DNF repo run: | rm -rf rpm/packages rpm/repodata @@ -340,9 +426,26 @@ jobs: esac done - echo "Adding Mariner 2 APT repository..." + if [ -r /etc/os-release ]; then + # shellcheck source=/dev/null + . /etc/os-release + fi + CODENAME="${VERSION_CODENAME:-}" + case "$CODENAME" in + bookworm|trixie) ;; + "") + echo "ERROR: VERSION_CODENAME is empty. Is this a Debian-based system with /etc/os-release?" >&2 + exit 1 + ;; + *) + echo "ERROR: Unsupported Debian suite '${CODENAME}'. Supported: bookworm, trixie." >&2 + exit 1 + ;; + esac + + echo "Adding Mariner 2 APT repository (suite: ${CODENAME})..." curl -fsSL https://amd989.github.io/mariner/gpg.key | gpg --dearmor -o /usr/share/keyrings/mariner3d.gpg - echo "deb [signed-by=/usr/share/keyrings/mariner3d.gpg] https://amd989.github.io/mariner stable main" > /etc/apt/sources.list.d/mariner3d.list + echo "deb [signed-by=/usr/share/keyrings/mariner3d.gpg] https://amd989.github.io/mariner ${CODENAME} main" > /etc/apt/sources.list.d/mariner3d.list if [ -n "$PREFER_ARMHF" ]; then native_arch=$(dpkg --print-architecture) @@ -368,6 +471,7 @@ jobs: echo " or re-run this script with --prefer-armhf (writes /etc/apt/preferences.d/mariner3d-prefer-armhf)." EOF chmod +x setup-apt.sh + cp setup-apt.sh setup.sh - name: Create DNF setup script run: | diff --git a/docs/software-setup.rst b/docs/software-setup.rst index 4c2fcbe6..79a68601 100644 --- a/docs/software-setup.rst +++ b/docs/software-setup.rst @@ -19,6 +19,18 @@ There are several ways to install Mariner 2 depending on your platform. Debian / Ubuntu / Raspberry Pi OS (apt) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Published ``.deb`` packages are built per Debian release codename (currently +**bookworm** and **trixie**). The install script selects the matching suite from +``/etc/os-release`` (``VERSION_CODENAME``). Pure **Ubuntu** releases use their +own codenames (for example ``noble``); those are not published here unless they +match a supported suite—use Docker, the RPM instructions below, or a +Debian-bookworm/trixie-based image (many **Raspberry Pi OS** releases do). + +The APT repository also publishes a **stable** suite that carries the same +packages as **bookworm**, so older ``sources.list`` lines that still use +``stable`` keep working. **Trixie** machines should use the ``trixie`` suite (or +re-run ``setup.sh``) so they install the build that matches their Python stack. + First, enable the repository: .. code-block:: shell-session @@ -31,12 +43,17 @@ Then install mariner: $ sudo apt install mariner3d -Or set up the repository manually: +On Debian-derived systems without a supported codename, the script exits with an +error; use Docker or install from source until a build exists for your suite. + +Or set up the repository manually (replace ``CODENAME`` with ``bookworm`` or +``trixie``, matching your distro): .. code-block:: shell-session $ curl -fsSL https://amd989.github.io/mariner/gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/mariner3d.gpg - $ echo "deb [signed-by=/usr/share/keyrings/mariner3d.gpg] https://amd989.github.io/mariner stable main" | sudo tee /etc/apt/sources.list.d/mariner3d.list + $ CODENAME=$(. /etc/os-release && echo "$VERSION_CODENAME") + $ echo "deb [signed-by=/usr/share/keyrings/mariner3d.gpg] https://amd989.github.io/mariner ${CODENAME} main" | sudo tee /etc/apt/sources.list.d/mariner3d.list $ sudo apt update $ sudo apt install mariner3d diff --git a/gh-pages/index.html b/gh-pages/index.html index 02e0074a..5bed155c 100644 --- a/gh-pages/index.html +++ b/gh-pages/index.html @@ -91,9 +91,10 @@

mariner3d

apt

-
Debian, Ubuntu, Raspberry Pi OS
- 
$ curl -fsSL https://amd989.github.io/mariner/setup-apt.sh | sudo bash
+      
Debian bookworm / trixie (and derivatives with the same codename, e.g. Raspberry Pi OS)

+      
$ curl -fsSL https://amd989.github.io/mariner/setup.sh | sudo bash
 $ sudo apt install mariner3d

+      
The script picks the bookworm or trixie APT suite from your system codename. setup-apt.sh is the same script.