From 9a34fec3d460ba84ec496c41161317ade47dc974 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Wed, 25 May 2022 10:29:44 +0200
Subject: [PATCH 1/4] build from source and not AUR

---
 .github/workflows/ci.yaml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index aaabde25..befcc22c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,20 +14,13 @@ jobs:
            pacman --noconfirm --noprogressbar -Syyu
            pacman --noconfirm --noprogressbar -Sy glslang libepoxy libfontenc libxcvt libxfont2 libxkbfile vulkan-headers vulkan-validation-layers xcb-util-errors xcb-util-renderutil xcb-util-wm xorg-fonts-encodings xorg-server-common xorg-setxkbmap xorg-xkbcomp xorg-xwayland git cmake go clang lld libc++ pkgconf meson ninja wayland wayland-protocols libinput libxkbcommon pixman glm libdrm libglvnd cairo pango systemd scdoc base-devel seatd
 
-      - name: Set up user
+      - name: Build wlroots-git
         run: |
-          useradd -m githubuser
-          echo -e "root ALL=(ALL:ALL) ALL\ngithubuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
-
-      - name: Get yay
-        run: |
-          su githubuser -c "cd ~ && mkdir yay && git clone https://aur.archlinux.org/yay.git"
-          chown -R githubuser /home/githubuser/yay
-          su githubuser -c "cd ~/yay && makepkg -si --noconfirm --noprogressbar"
-
-      - name: Get wlroots-git
-        run: |
-          su githubuser -c "yay -S --mflags --skipinteg --noprovides --answerclean All --answerdiff None --answeredit None --answerupgrade None wlroots-git"
+          git clone https://gitlab.freedesktop.org/wlroots/wlroots && cd wlroots
+          meson build/
+          ninja -C build/
+          ninja -C build/ install
+          cd ..
 
       - name: Fix permissions for git
         run: |

From 73c9b87636fbd2ef9e696f39ebacc1b280342414 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Wed, 25 May 2022 10:34:04 +0200
Subject: [PATCH 2/4] Build with a user

---
 .github/workflows/ci.yaml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index befcc22c..9ee87f9e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,13 +14,14 @@ jobs:
            pacman --noconfirm --noprogressbar -Syyu
            pacman --noconfirm --noprogressbar -Sy glslang libepoxy libfontenc libxcvt libxfont2 libxkbfile vulkan-headers vulkan-validation-layers xcb-util-errors xcb-util-renderutil xcb-util-wm xorg-fonts-encodings xorg-server-common xorg-setxkbmap xorg-xkbcomp xorg-xwayland git cmake go clang lld libc++ pkgconf meson ninja wayland wayland-protocols libinput libxkbcommon pixman glm libdrm libglvnd cairo pango systemd scdoc base-devel seatd
 
-      - name: Build wlroots-git
+      - name: Set up user
         run: |
-          git clone https://gitlab.freedesktop.org/wlroots/wlroots && cd wlroots
-          meson build/
-          ninja -C build/
-          ninja -C build/ install
-          cd ..
+          useradd -m githubuser
+          echo -e "root ALL=(ALL:ALL) ALL\ngithubuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
+
+      - name: Get yay
+        run: |
+          su githubuser -c "git clone https://gitlab.freedesktop.org/wlroots/wlroots && cd wlroots && meson build/ && ninja -C build/ && sudo ninja -C build/ install && cd .."
 
       - name: Fix permissions for git
         run: |

From 04eb3f922ce232188af2a21c51e6198ee5d8d074 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Wed, 25 May 2022 10:37:08 +0200
Subject: [PATCH 3/4] respect perms

---
 .github/workflows/ci.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 9ee87f9e..760d1532 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -19,9 +19,10 @@ jobs:
           useradd -m githubuser
           echo -e "root ALL=(ALL:ALL) ALL\ngithubuser ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers
 
-      - name: Get yay
+      - name: Build wlroots
         run: |
-          su githubuser -c "git clone https://gitlab.freedesktop.org/wlroots/wlroots && cd wlroots && meson build/ && ninja -C build/ && sudo ninja -C build/ install && cd .."
+          su githubuser -c "cd ~ && git clone https://gitlab.freedesktop.org/wlroots/wlroots" 
+          su githubuser -c "cd ~/wlroots && meson build/ && ninja -C build/ && sudo ninja -C build/ install && cd .."
 
       - name: Fix permissions for git
         run: |

From 86c00752b7c6810f8c9705ca3bf115c567b21c46 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Wed, 25 May 2022 11:04:55 +0200
Subject: [PATCH 4/4] meson prefix to /usr

---
 .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 760d1532..13d30e1c 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -22,7 +22,7 @@ jobs:
       - name: Build wlroots
         run: |
           su githubuser -c "cd ~ && git clone https://gitlab.freedesktop.org/wlroots/wlroots" 
-          su githubuser -c "cd ~/wlroots && meson build/ && ninja -C build/ && sudo ninja -C build/ install && cd .."
+          su githubuser -c "cd ~/wlroots && meson build/ --prefix=/usr && ninja -C build/ && sudo ninja -C build/ install && cd .."
 
       - name: Fix permissions for git
         run: |