From 1b57f6fcca71f528879f739edb7b05f5c4b3ae80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=20Go=C3=B1i?= <josu_z@hotmail.com>
Date: Tue, 5 Nov 2024 16:36:10 +0100
Subject: [PATCH] Merge CI jobs

---
 .github/workflows/ci.yml  | 12 ++++++++++++
 .github/workflows/nix.yml | 20 --------------------
 2 files changed, 12 insertions(+), 20 deletions(-)
 delete mode 100644 .github/workflows/nix.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5b96d4..3fdcf32 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,3 +50,15 @@ jobs:
     - name: "Check installation"
       working-directory: ./razer_control_gui
       run: ../ci-helpers/check-installation.sh
+
+  build-nix:
+    name: "Build and check Nix"
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/checkout@v4
+      - uses: cachix/install-nix-action@v27
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - run: nix build
+      - run: nix flake check
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
deleted file mode 100644
index ea560b3..0000000
--- a/.github/workflows/nix.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: "Nix"
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  build:
-    name: "Build flake"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v27
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - run: nix build
-      - run: nix flake check