Fix build after hyprutils was added (#96)

* Fix build after hyprutils was added * fix release github action
Duckonaut · Jun 14, 2024 · 3221d3b · 3221d3b
1 parent 342de8a
commit 3221d3b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
     - name: Install dependencies
       run: |
-        pacman -Syu --noconfirm hyprland meson ninja
+        sudo -u user sh -c "paru -Syu --noconfirm hyprland meson ninja cpio hyprwayland-scanner hyprutils"
 
     - name: Get version from installed Hyprland
       run: |
@@ -31,13 +31,28 @@ jobs:
         fi
         echo "GIT_COMMIT_HASH=$hash" >> $GITHUB_ENV
 
+    - name: Checkout Hyprland repository
+      uses: actions/checkout@v4
+      with:
+        repository: hyprwm/Hyprland
+        ref: ${{ env.GIT_COMMIT_HASH }}
+        path: Hyprland
+        submodules: recursive
+
+    - name: Run `make installheaders` in Hyprland repository
+      run: |
+        cd Hyprland
+        make all && make installheaders
+
     - name: Checkout current repository and checkout pinned commit
       uses: actions/checkout@v4
       with:
         fetch-depth: 0 # to allow checkout out a specific commit later
+        path: split-monitor-workspaces
 
     - name: Get pinned commit from hyprpm.toml file
       run: |
+        cd split-monitor-workspaces
         commit=$(grep -F "$GIT_COMMIT_HASH" hyprpm.toml | awk -F'"' '{print $4}')
         if [ -z "$commit" ]; then
           echo "Failed to get pinned commit from hyprpm.toml with GIT_COMMIT_HASH=$GIT_COMMIT_HASH"
@@ -47,11 +62,13 @@ jobs:
 
     - name: Checkout pinned commit
       run: |
+        cd split-monitor-workspaces
         echo "Checking out pinned commit $PINNED_COMMIT"
         git config --global --add safe.directory /__w/split-monitor-workspaces/split-monitor-workspaces # fix dubious ownership warning
         git checkout $PINNED_COMMIT
 
     - name: Build current repository
       run: |
+        cd split-monitor-workspaces
         meson setup build --wipe
         ninja -C build
diff --git a/src/main.cpp b/src/main.cpp
@@ -4,11 +4,10 @@
 #include <hyprland/src/config/ConfigManager.hpp>
 #include <hyprland/src/desktop/Workspace.hpp>
 #include <hyprland/src/helpers/Color.hpp>
-#include <hyprland/src/helpers/memory/SharedPtr.hpp>
 #include <hyprland/src/managers/KeybindManager.hpp>
+#include <hyprutils/memory/SharedPtr.hpp>
 
 #include "globals.hpp"
-#include "hyprland/src/SharedDefs.hpp"
 
 #include <map>
 #include <unistd.h>