f

Author: sonnyp

.github/workflows/CI.yaml

@@ -9,63 +9,54 @@ on:
 
 jobs:
   CI:
-    runs-on: ubuntu-latest
-
-    container:
-      image: fedora:44
+    # https://github.com/actions/runner-images/issues/13964
+    runs-on: ubuntu-26.04
 
     steps:
       - name: Install host dependencies
         run: |
-          dnf -y update
-          dnf -y install flatpak mutter flatpak-builder foundry git make
+          sudo apt-get -y update
+          sudo apt-get -y install flatpak mutter flatpak-builder foundry
 
       - uses: actions/checkout@v3
         with:
           submodules: recursive
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 24
           cache: "npm"
 
-      # Restore caches
-      - name: Restore Flatpak dependencies
-        uses: actions/cache/restore@v3
-        with:
-          path: ~/.local/share/flatpak
-          key: flatpak-deps-${{ runner.os }}
-      - name: Restore .flatpak-builder
-        uses: actions/cache/restore@v3
-        with:
-          path: .flatpak-builder
-          key: flatpak-builder-${{ runner.os }}
-      - name: Restore .foundry
-        uses: actions/cache/restore@v3
-        with:
-          path: .foundry
-          key: foundry-${{ runner.os }}
-
       - run: mutter --wayland --no-x11 --headless --wayland-display=wayland-0 --virtual-monitor 1280x720 > /tmp/mutter.log 2>&1 &
       - run: make ci
       - run: cat /tmp/mutter.log
 
-      # Save caches
-      - name: Save Flatpak dependencies
-        uses: actions/cache/save@v3
-        if: always()
+      # Cache apt
+      - name: Cache apt
+        uses: actions/cache@v4
+        with:
+          path: |
+            /var/cache/apt/archives
+            /var/lib/apt/lists
+          key: apt-cache-${{ runner.os }}
+
+      # Cache Flatpak
+      - name: Cache Flatpak dependencies
+        uses: actions/cache@v4
         with:
           path: ~/.local/share/flatpak
           key: flatpak-deps-${{ runner.os }}
-      - name: Save .flatpak-builder
-        uses: actions/cache/save@v3
-        if: always()
+
+      # Cache flatpak-builder state
+      - name: Cache .flatpak-builder
+        uses: actions/cache@v4
         with:
           path: .flatpak-builder
           key: flatpak-builder-${{ runner.os }}
-      - name: Save .foundry
-        uses: actions/cache/save@v3
-        if: always()
+
+      # Cache Foundry
+      - name: Cache .foundry
+        uses: actions/cache@v4
         with:
           path: .foundry
           key: foundry-${{ runner.os }}