ci(ppa): add Ubuntu 26.04 (Resolute) PPA build (#254) (#256)

* ci(ppa): add Ubuntu 26.04 (Resolute) PPA build (#254)

* ci(ppa): pin rustc/cargo per release (resolute=1.91)

Author: domcyrus

.github/workflows/ppa-release.yml

@@ -13,12 +13,11 @@ on:
       ubuntu_release:
         description: 'Ubuntu release codename'
         required: true
-        default: 'oracular'
+        default: 'resolute'
         type: choice
         options:
-          - questing # 25.04
-          - oracular # 24.10 with Rust 1.81
-          - noble # 24.04 LTS with Rust 1.82
+          - questing # 25.10
+          - resolute # 26.04 LTS
       tarball_suffix:
         description: 'Tarball suffix (e.g., ds1, ds2) - leave empty for new releases'
         required: false
@@ -34,12 +33,28 @@ env:
   PPA: ppa:domcyrus/rustnet
 
 jobs:
+  set-matrix:
+    runs-on: ubuntu-24.04
+    outputs:
+      releases: ${{ steps.set.outputs.releases }}
+    steps:
+      - id: set
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo 'releases=["${{ inputs.ubuntu_release }}"]' >> $GITHUB_OUTPUT
+            echo "Dispatch: building only ${{ inputs.ubuntu_release }}"
+          else
+            echo 'releases=["questing","resolute"]' >> $GITHUB_OUTPUT
+            echo "Auto: building questing and resolute"
+          fi
+
   build-and-upload:
+    needs: set-matrix
     runs-on: ubuntu-24.04
     strategy:
+      fail-fast: false
       matrix:
-        ubuntu_release:
-          - questing
+        ubuntu_release: ${{ fromJSON(needs.set-matrix.outputs.releases) }}
 
     steps:
       - name: Checkout code
@@ -91,28 +106,40 @@ jobs:
             echo "Using version: $VERSION"
           fi
 
-          # Extract Debian revision from changelog
-          DEBIAN_REVISION=$(head -1 debian/changelog | sed 's/.*(\(.*\)-\(.*\)).*/\2/')
-          echo "debian_revision=$DEBIAN_REVISION" >> $GITHUB_OUTPUT
-
       - name: Update changelog
         run: |
           VERSION="${{ steps.version.outputs.version }}"
-          CURRENT_VERSION=$(head -1 debian/changelog | sed 's/.*(\(.*\)).*/\1/')
+          # Per-series version suffix so each Ubuntu release has an independent
+          # version line on Launchpad. The `+series1` suffix sorts strictly
+          # higher than a plain `-1ubuntu1`, so future uploads always supersede
+          # any previously published package.
+          NEW_VERSION="${VERSION}-1ubuntu1+${{ matrix.ubuntu_release }}1"
 
-          if [ "$VERSION-1ubuntu1" != "$CURRENT_VERSION" ]; then
-            echo "Updating changelog from $CURRENT_VERSION to $VERSION-1ubuntu1"
+          DEBFULLNAME="${{ env.DEBFULLNAME }}" DEBEMAIL="${{ env.DEBEMAIL }}" \
+            dch --newversion "$NEW_VERSION" \
+                --distribution "${{ matrix.ubuntu_release }}" \
+                "Build for ${{ matrix.ubuntu_release }} - upstream release $VERSION"
 
-            # Create new changelog entry
-            DEBFULLNAME="${{ env.DEBFULLNAME }}" DEBEMAIL="${{ env.DEBEMAIL }}" \
-              dch --newversion "$VERSION-1ubuntu1" \
-                  --distribution "questing" \
-                  "New upstream release $VERSION"
+          echo "✓ Changelog set to $NEW_VERSION (${{ matrix.ubuntu_release }})"
 
-            echo "✓ Changelog updated"
-          else
-            echo "✓ Changelog already at correct version"
-          fi
+      - name: Pin Rust toolchain version per release
+        run: |
+          # Each Ubuntu release ships a different set of versioned rustc/cargo
+          # packages. We pin to the lowest version available on the target
+          # release that still satisfies our >= 1.88 floor (let-chains).
+          case "${{ matrix.ubuntu_release }}" in
+            questing) RUST_VERSION=1.88 ;;
+            resolute) RUST_VERSION=1.91 ;;
+            *) echo "::error::Unknown release ${{ matrix.ubuntu_release }} - add it to the case statement"; exit 1 ;;
+          esac
+          echo "Pinning to rustc-$RUST_VERSION / cargo-$RUST_VERSION for ${{ matrix.ubuntu_release }}"
+
+          sed -i -E "s/(cargo|rustc|rustdoc)-1\.[0-9]+/\1-${RUST_VERSION}/g" debian/control debian/rules
+
+          echo "--- debian/control build-depends ---"
+          grep -E "(cargo|rustc)-1\." debian/control || true
+          echo "--- debian/rules toolchain exports ---"
+          grep -E "(CARGO|RUSTC|RUSTDOC) *=" debian/rules || true
 
       - name: Build source package
         run: |
@@ -171,9 +198,14 @@ jobs:
           GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
         run: |
           cd build-ppa
-          VERSION="${{ steps.version.outputs.version }}"
-          DEBIAN_REVISION="${{ steps.version.outputs.debian_revision }}"
-          CHANGES_FILE="rustnet-monitor_${VERSION}-${DEBIAN_REVISION}_source.changes"
+          # Locate the source.changes file produced by debuild. The version
+          # suffix (+seriesN) is dynamic, so glob rather than reconstruct.
+          CHANGES_FILE=$(ls rustnet-monitor_*_source.changes | head -1)
+          if [ -z "$CHANGES_FILE" ]; then
+            echo "::error::No source.changes file found in build-ppa"
+            exit 1
+          fi
+          echo "Signing and uploading $CHANGES_FILE"
 
           # Sign
           debsign -k${GPG_KEY_ID} ${CHANGES_FILE}
@@ -198,10 +230,14 @@ jobs:
 
       - name: Summary
         run: |
+          cd build-ppa
+          CHANGES_FILE=$(ls rustnet-monitor_*_source.changes | head -1)
+          FULL_VERSION=$(echo "$CHANGES_FILE" | sed 's/rustnet-monitor_\(.*\)_source\.changes/\1/')
+
           echo "## 🎉 PPA Upload Complete" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "- **Package**: rustnet-monitor" >> $GITHUB_STEP_SUMMARY
-          echo "- **Version**: ${{ steps.version.outputs.version }}-${{ steps.version.outputs.debian_revision }}" >> $GITHUB_STEP_SUMMARY
+          echo "- **Version**: $FULL_VERSION" >> $GITHUB_STEP_SUMMARY
           echo "- **Ubuntu**: ${{ matrix.ubuntu_release }}" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "### Installation" >> $GITHUB_STEP_SUMMARY
@@ -210,4 +246,4 @@ jobs:
           echo "sudo apt update && sudo apt install rustnet" >> $GITHUB_STEP_SUMMARY
           echo '```' >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "[View PPA →](https://launchpad.net/~domcyrus/+archive/ubuntu/rustnet/+packages)" >> $GITHUB_STEP_SUMMARY
+          echo "[View PPA](https://launchpad.net/~domcyrus/+archive/ubuntu/rustnet/+packages)" >> $GITHUB_STEP_SUMMARY

INSTALL.md

@@ -89,9 +89,12 @@ choco install rustnet
 
 ### Linux Package Installation
 
-#### Ubuntu PPA (Recommended for Ubuntu 25.10+)
+#### Ubuntu PPA (Recommended for Ubuntu 25.10 Questing and 26.04 LTS Resolute)
 
-The easiest way to install RustNet on Ubuntu is via the official PPA.
+The easiest way to install RustNet on Ubuntu is via the official PPA. The PPA publishes builds for the following Ubuntu series:
+
+- Ubuntu 25.10 (Questing Quokka)
+- Ubuntu 26.04 LTS (Resolute Raccoon)
 
 ```bash
 # Add the RustNet PPA
@@ -111,7 +114,7 @@ sudo setcap 'cap_net_raw,cap_bpf,cap_perfmon+eip' /usr/bin/rustnet
 rustnet
 ```
 
-**Important:** The PPA only supports Ubuntu 25.10+ due to the Rust 1.88+ requirement. Earlier Ubuntu versions don't have a recent enough Rust compiler in their repositories. For older Ubuntu versions, use the [.deb packages](#debianubuntu-deb-packages) from GitHub releases or [build from source](#building-from-source).
+**Important:** The PPA supports only the two series listed above (Ubuntu 25.10 Questing and 26.04 LTS Resolute) because the build requires Rust 1.88+ (used for let-chains in the project). Earlier Ubuntu versions don't ship a recent enough `rustc` in their repositories. For older Ubuntu versions, use the [.deb packages](#debianubuntu-deb-packages) from GitHub releases or [build from source](#building-from-source).
 
 #### Debian/Ubuntu (.deb packages)
 

RELEASE.md

@@ -157,6 +157,16 @@ After GitHub Actions completes:
 - [ ] Verify FreeBSD build at https://github.com/domcyrus/rustnet-bsd
 - [ ] Announce release (if applicable)
 
+## Maintenance: New Ubuntu and Fedora Releases
+
+This is an occasional task, not part of every release. When a new Ubuntu interim or LTS, or a new Fedora release, is published and we want RustNet packages to ship for it:
+
+1. **Ubuntu PPA**: add the new codename to the matrix in [`.github/workflows/ppa-release.yml`](.github/workflows/ppa-release.yml) (the `set-matrix` job's `releases=[...]` list and the `workflow_dispatch` choice options). Confirm the new series ships `rustc-1.88` (or whatever the current `rust-version` floor in `Cargo.toml` is). Reference: issue [#254](https://github.com/domcyrus/rustnet/issues/254) added Ubuntu 26.04 (Resolute) support.
+2. **Fedora COPR**: add the new chroot in the COPR project settings at [https://copr.fedorainfracloud.org/coprs/domcyrus/rustnet/edit/](https://copr.fedorainfracloud.org/coprs/domcyrus/rustnet/edit/). The chroot list is managed in the COPR UI, not in this repo.
+3. Trigger a `workflow_dispatch` of `Release to Ubuntu PPA` for the new codename to verify the build before relying on it from the next tagged release.
+
+Conversely, when an older Ubuntu series is no longer worth supporting (no `rustc-1.88` in archive, or end of life), remove it from the same two locations and update [INSTALL.md](INSTALL.md) and [debian/README.md](debian/README.md) to match.
+
 ## Versioning
 
 RustNet follows [Semantic Versioning (SemVer)](https://semver.org/):

debian/README.md

@@ -11,7 +11,12 @@ git tag v1.0.0
 git push origin v1.0.0
 ```
 
-This automatically builds and uploads to Ubuntu 25.10+ which has Rust 1.88+ for edition 2024 support.
+This automatically builds and uploads source packages for both supported Ubuntu series:
+
+- Ubuntu 25.10 (Questing Quokka)
+- Ubuntu 26.04 LTS (Resolute Raccoon)
+
+Both series ship `rustc-1.88` / `cargo-1.88`, which is the minimum required for the let-chains feature used by the project (see `rust-version` in `Cargo.toml`).
 
 ## GitHub Secrets Setup
 
@@ -49,7 +54,7 @@ sudo apt install rustnet
 - **Binary**: rustnet
 - **Maintainer**: Marco Cadetg <cadetg@gmail.com>
 - **PPA**: https://launchpad.net/~domcyrus/+archive/ubuntu/rustnet
-- **Supported**: Ubuntu 25.10 and later
+- **Supported**: Ubuntu 25.10 (Questing) and 26.04 LTS (Resolute)
 - **Architectures**: amd64, arm64, armhf
 
 ## Workflow