From 95d2cbb5666fd0d8c78adcabf5ff4edf35c8d4cc Mon Sep 17 00:00:00 2001
From: Albert Armea <github@albertarmea.com>
Date: Mon, 29 Dec 2025 09:14:49 -0500
Subject: [PATCH] Use Ubuntu 25.10 in CI

We still need gtk4-layer-shell-dev, which is not available in Ubuntu
24.04.

I would have preferred to define an environment variable rather than
duplicating `image: ubuntu:25.10` everywhere, but those aren't supported
in the `container` field.
---
 .github/workflows/ci.yml | 63 +++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ac0276e..b53535b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,16 +27,20 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu:25.10
     steps:
+      - name: Install git and dependencies
+        run: |
+          apt-get update
+          apt-get install -y git curl ${{ env.SYSTEM_DEPS }}
+
       - uses: actions/checkout@v4
 
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ${{ env.SYSTEM_DEPS }}
-
       - name: Setup Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
       - name: Cache cargo registry and build
         uses: actions/cache@v4
@@ -50,21 +54,27 @@ jobs:
             ${{ runner.os }}-cargo-
 
       - name: Build
-        run: cargo build --all-targets
+        run: |
+          . "$HOME/.cargo/env"
+          cargo build --all-targets
 
   test:
     name: Test
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu:25.10
     steps:
+      - name: Install git and dependencies
+        run: |
+          apt-get update
+          apt-get install -y git curl ${{ env.SYSTEM_DEPS }}
+
       - uses: actions/checkout@v4
 
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ${{ env.SYSTEM_DEPS }}
-
       - name: Setup Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
       - name: Cache cargo registry and build
         uses: actions/cache@v4
@@ -78,23 +88,28 @@ jobs:
             ${{ runner.os }}-cargo-
 
       - name: Run tests
-        run: cargo test --all-targets
+        run: |
+          . "$HOME/.cargo/env"
+          cargo test --all-targets
 
   lint:
     name: Clippy
     runs-on: ubuntu-latest
+    container:
+      image: ubuntu:25.10
     steps:
+      - name: Install git and dependencies
+        run: |
+          apt-get update
+          apt-get install -y git curl ${{ env.SYSTEM_DEPS }}
+
       - uses: actions/checkout@v4
 
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y ${{ env.SYSTEM_DEPS }}
-
       - name: Setup Rust toolchain
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          components: clippy
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+          rustup component add clippy
+          echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
       - name: Cache cargo registry and build
         uses: actions/cache@v4
@@ -108,4 +123,6 @@ jobs:
             ${{ runner.os }}-cargo-
 
       - name: Run Clippy
-        run: cargo clippy --all-targets -- -D warnings
+        run: |
+          . "$HOME/.cargo/env"
+          cargo clippy --all-targets -- -D warnings