diff options
| -rw-r--r-- | cmd/hakurei/testsuite/main.go | 24 | ||||
| -rw-r--r-- | internal/rosa/package/noto.az | 1 | ||||
| -rw-r--r-- | internal/workflows/Containerfile | 5 |
3 files changed, 19 insertions, 11 deletions
diff --git a/cmd/hakurei/testsuite/main.go b/cmd/hakurei/testsuite/main.go index b2348ac6..9e7455a5 100644 --- a/cmd/hakurei/testsuite/main.go +++ b/cmd/hakurei/testsuite/main.go @@ -512,13 +512,14 @@ func main() { "wayland-security-context", "wayland security-context-v1", false, false, false, 0, func(c *hst.Config) { c.Enablements = new(hst.EWayland) - c.Container.Path = prefix.Append("bin", "grim") - c.Container.Args = []string{"grim"} + c.Container.Path = prefix.Append("bin", "wayland-info") + c.Container.Args = []string{"wayland-info"} }, nil, func(output string) bool { - return output == "warning: zxdg_output_manager_v1 isn't available, "+ - "guessing the output layout\r\n"+ - "compositor doesn't support wlr-screencopy-unstable-v1\r\n" - }, hst.ExitFailure, + return !strings.Contains( + output, + "zwlr_screencopy_manager_v1", + ) + }, 0, ) checkHakurei( @@ -527,9 +528,14 @@ func main() { false, false, true, 0, func(c *hst.Config) { c.Enablements = new(hst.EWayland) c.DirectWayland = true - c.Container.Path = prefix.Append("bin", "grim") - c.Container.Args = []string{"grim", "/dev/null"} - }, nil, nil, 0, + c.Container.Path = prefix.Append("bin", "wayland-info") + c.Container.Args = []string{"wayland-info"} + }, nil, func(output string) bool { + return strings.Contains( + output, + "\ninterface: 'zwlr_screencopy_manager_v1',", + ) + }, 0, ) // this client lacks attached identification diff --git a/internal/rosa/package/noto.az b/internal/rosa/package/noto.az index 2103100f..aa017f89 100644 --- a/internal/rosa/package/noto.az +++ b/internal/rosa/package/noto.az @@ -29,4 +29,5 @@ rename -v 's/\[.*\]//' $DEST/* }; tools = [ rename ]; + cross = nil; } diff --git a/internal/workflows/Containerfile b/internal/workflows/Containerfile index 991205b3..209fb8cd 100644 --- a/internal/workflows/Containerfile +++ b/internal/workflows/Containerfile @@ -2,13 +2,15 @@ FROM docker.gitea.com/runner-images:ubuntu-latest RUN rm /var/run && ln -sf ../run /var && mkdir /var/empty RUN add-apt-repository -y ppa:savoury1/pipewire && \ + add-apt-repository -y ppa:longsleep/golang-backports && \ apt-get update && apt-get install -y \ - msft-golang \ + golang-go \ libmount-dev \ acl \ sway \ xwayland \ x11-xserver-utils \ + wayland-utils \ xdg-dbus-proxy \ libnotify-bin \ pipewire \ @@ -17,7 +19,6 @@ RUN add-apt-repository -y ppa:savoury1/pipewire && \ pulseaudio-utils \ foot \ xterm \ - grim \ fuse3 \ fsmark && \ apt-get clean && rm -rf /var/lib/apt/lists/* |
