f

Author: sonnyp

.github/workflows/CI.yaml

@@ -1,5 +1,7 @@
 name: CI
 
+# See also https://github.com/flatpak/flatpak-github-actions
+
 on:
   pull_request:
     branches: [main]
@@ -9,11 +11,11 @@ jobs:
   CI:
     runs-on: ubuntu-latest
 
-    env:
-      FOUNDRY_DIR: ${{ github.workspace }}/.foundry
+    container:
+      image: fedora:44
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
 
@@ -22,57 +24,26 @@ jobs:
           node-version: 20
           cache: "npm"
 
-      # -----------------------------
-      # System dependencies
-      # -----------------------------
       - name: Install host dependencies
         run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            flatpak flatpak-builder mutter \
-            git meson ninja-build gcc pkg-config \
-            libglib2.0-dev libgtk-4-dev
-
-      # -----------------------------
-      # Build GNOME Foundry from source (Option B)
-      # -----------------------------
-      - name: Clone and build GNOME Foundry
-        run: |
-          if [ ! -d "$FOUNDRY_DIR/install/bin" ]; then
-            echo "Building Foundry from source..."
-
-            git clone https://gitlab.gnome.org/GNOME/foundry.git "$FOUNDRY_DIR/src"
-
-            meson setup "$FOUNDRY_DIR/build" "$FOUNDRY_DIR/src" \
-              --prefix="$FOUNDRY_DIR/install"
-
-            ninja -C "$FOUNDRY_DIR/build"
-            ninja -C "$FOUNDRY_DIR/build" install
-          else
-            echo "Foundry already built (cache hit)"
-          fi
-
-          echo "$FOUNDRY_DIR/install/bin" >> $GITHUB_PATH
+          sudo dnf -y update
+          sudo dnf -y install flatpak mutter flatpak-builder foundry
 
-      # -----------------------------
       # Restore caches
-      # -----------------------------
       - name: Restore Flatpak dependencies
         uses: actions/cache/restore@v3
         with:
           path: ~/.local/share/flatpak
           key: ${{ runner.os }}-flatpak-dependencies-${{ github.run_id }}
           restore-keys: |
             ${{ runner.os }}-flatpak-dependencies-
-
       - name: Restore .flatpak-builder
         uses: actions/cache/restore@v3
         with:
           path: .flatpak-builder
           key: ${{ runner.os }}-flatpak-builder-${{ github.run_id }}
           restore-keys: |
             ${{ runner.os }}-flatpak-builder-
-
       - name: Restore .foundry
         uses: actions/cache/restore@v3
         with:
@@ -81,38 +52,23 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-foundry-
 
-      # -----------------------------
-      # Headless GNOME runtime
-      # -----------------------------
-      - run: |
-          mutter --wayland --no-x11 --headless \
-            --wayland-display=wayland-0 \
-            --virtual-monitor 1280x720 > /tmp/mutter.log 2>&1 &
-
-      # -----------------------------
-      # CI
-      # -----------------------------
+      - 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()
         with:
           path: ~/.local/share/flatpak
           key: ${{ runner.os }}-flatpak-dependencies-${{ github.run_id }}
-
       - name: Save .flatpak-builder
         uses: actions/cache/save@v3
         if: always()
         with:
           path: .flatpak-builder
           key: ${{ runner.os }}-flatpak-builder-${{ github.run_id }}
-
       - name: Save .foundry
         uses: actions/cache/save@v3
         if: always()