Skip to content

Fix CI #1032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sonnyp merged 2 commits into from
Sep 4, 2026
Merged

Fix CI #1032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d734fc3
f
sonnyp Sep 4, 2026
7ee669a
f
sonnyp Sep 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/CI.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
7 changes: 4 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading