From d734fc34fa475bde2f2232fc725fb848a3148d67 Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Fri, 4 Sep 2026 12:28:27 +0200 Subject: [PATCH 1/2] f --- .github/workflows/CI.yaml | 2 +- Makefile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 8a80debac..87c653f9e 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -55,5 +55,5 @@ jobs: cache: "npm" - run: mutter --wayland --no-x11 --headless --wayland-display=wayland-0 --virtual-monitor 1280x720 > /tmp/mutter.log 2>&1 & - - run: make ci + - run: make FLATPAK_ARGS=--user ci - run: cat /tmp/mutter.log diff --git a/Makefile b/Makefile index 3b0063211..9c8627ef2 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,11 @@ SHELL:=/bin/bash -O globstar ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) .PHONY: setup build lint unit test ci sandbox flatpak .DEFAULT_GOAL := setup +FLATPAK_ARGS ?= setup: - flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo - flatpak install --or-update --noninteractive flathub org.gnome.Sdk//50 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//25.08 org.freedesktop.Sdk.Extension.vala//25.08 org.freedesktop.Sdk.Extension.llvm22//25.08 org.freedesktop.Sdk.Extension.node26//25.08 org.freedesktop.Sdk.Extension.typescript//25.08 + flatpak $(FLATPAK_ARGS) remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + flatpak $(FLATPAK_ARGS) install --or-update --noninteractive flathub org.gnome.Sdk//50 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//25.08 org.freedesktop.Sdk.Extension.vala//25.08 org.freedesktop.Sdk.Extension.llvm22//25.08 org.freedesktop.Sdk.Extension.node26//25.08 org.freedesktop.Sdk.Extension.typescript//25.08 # flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo # flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo # flatpak install --or-update --noninteractive gnome-nightly org.gnome.Sdk//master @@ -66,7 +67,7 @@ install: | tail -n1 \ | sed 's|^file://||'); \ test -n "$$artifact" || { echo "No artifact found"; exit 1; }; \ - flatpak install --assumeyes "$$artifact" + flatpak $(FLATPAK_ARGS) install --assumeyes "$$artifact" ci: setup build test install # We install because foundry has no flag to override permissions From 7ee669ac598a2779d24fd26da1abdb8aff658db6 Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Fri, 4 Sep 2026 12:41:50 +0200 Subject: [PATCH 2/2] f --- .github/workflows/CI.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml index 87c653f9e..11eef31af 100644 --- a/.github/workflows/CI.yaml +++ b/.github/workflows/CI.yaml @@ -37,7 +37,7 @@ jobs: - name: Cache .foundry uses: actions/cache@v4 with: - path: .foundry + path: .foundry/cache key: foundry-${{ runner.arch }} - name: Install host dependencies