different approach

4 files changed, 18 insertions, 8 deletions

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 5deb24a2..a797222e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,9 +1,12 @@
 name: Build Hyprland
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on: [push, pull_request, workflow_dispatch]
 jobs:
   gcc:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: "Build Hyprland (Arch)"
     runs-on: ubuntu-latest
     container:
@@ -45,7 +48,6 @@ jobs:
           path: Hyprland.tar.xz
 
   meson:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: "Build Hyprland with Meson (Arch)"
     runs-on: ubuntu-latest
     container:
@@ -66,7 +68,6 @@ jobs:
         run: ninja -C build
 
   no-pch:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: "Build Hyprland without precompiled headers (Arch)"
     runs-on: ubuntu-latest
     container:
@@ -86,7 +87,6 @@ jobs:
         run: make nopch
 
   noxwayland:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: "Build Hyprland in pure Wayland (Arch)"
     runs-on: ubuntu-latest
     container:
@@ -107,7 +107,6 @@ jobs:
         run: make release
 
   clang-format:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: "Code Style (Arch)"
     runs-on: ubuntu-latest
     container:
diff --git a/.github/workflows/man-update.yaml b/.github/workflows/man-update.yaml
index b47787c0..aa93d4c3 100644
--- a/.github/workflows/man-update.yaml
+++ b/.github/workflows/man-update.yaml
@@ -8,6 +8,10 @@ on:
     branches:
       - 'main'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   main:
     name: Build man pages
diff --git a/.github/workflows/nix-ci.yml b/.github/workflows/nix-ci.yml
index 92db80f2..a05caab4 100644
--- a/.github/workflows/nix-ci.yml
+++ b/.github/workflows/nix-ci.yml
@@ -2,14 +2,18 @@ name: Nix
 
 on: [push, pull_request, workflow_dispatch]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   update-inputs:
-    if: (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name)
+    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     uses: ./.github/workflows/nix-update-inputs.yml
     secrets: inherit
 
   build:
-    if: (always() && !cancelled() && !contains(needs.*.result, 'failure')) && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name)
+    if: always() && !cancelled() && !contains(needs.*.result, 'failure')
     needs: update-inputs
     uses: ./.github/workflows/nix-build.yml
     secrets: inherit
diff --git a/.github/workflows/security-checks.yml b/.github/workflows/security-checks.yml
index 7aa8e2dd..cbd50c4d 100644
--- a/.github/workflows/security-checks.yml
+++ b/.github/workflows/security-checks.yml
@@ -2,9 +2,12 @@ name: Security Checks
 
 on: [push, pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   flawfinder:
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
     name: Flawfinder Checks
     runs-on: ubuntu-latest
     permissions: