From 1aae0bcd40accc760e30d5c1bab09c1303bca2bf Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 24 May 2024 09:09:48 +1200
Subject: [PATCH 1/2] ci: Move nix build to extra-builds.yml

Skip duplicate actions on nix build.
---
 .github/workflows/extra-builds.yml       | 14 ++++++++++++++
 .github/workflows/nix-github-actions.yml | 15 ---------------
 2 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 .github/workflows/nix-github-actions.yml

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 260394a3ffe..031f696537a 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -81,3 +81,17 @@ jobs:
           END
 
           make -C build -f ../Makefile CXX=clang -j$(nproc)
+
+  nix-build:
+    name: "Build nix flake"
+    needs: pre_job
+    if: needs.pre_job.outputs.should_skip != 'true'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+        submodules: true
+      - uses: cachix/install-nix-action@v26
+        with:
+        install_url: https://releases.nixos.org/nix/nix-2.18.1/install
+      - run: nix build .?submodules=1
diff --git a/.github/workflows/nix-github-actions.yml b/.github/workflows/nix-github-actions.yml
deleted file mode 100644
index 6d5c5b4b2dd..00000000000
--- a/.github/workflows/nix-github-actions.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: "build nix flake"
-on:
-  pull_request:
-  push:
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-       submodules: true
-    - uses: cachix/install-nix-action@v26
-      with:
-       install_url: https://releases.nixos.org/nix/nix-2.18.1/install
-    - run: nix build .?submodules=1

From d135c0bf87b0054cffd77ff6dbc030b194d5ef12 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Fri, 24 May 2024 09:41:31 +1200
Subject: [PATCH 2/2] extra-builds.yml: Fix indentation

---
 .github/workflows/extra-builds.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/extra-builds.yml b/.github/workflows/extra-builds.yml
index 031f696537a..d7c6e13ff06 100644
--- a/.github/workflows/extra-builds.yml
+++ b/.github/workflows/extra-builds.yml
@@ -90,8 +90,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-        submodules: true
+          submodules: true
       - uses: cachix/install-nix-action@v26
         with:
-        install_url: https://releases.nixos.org/nix/nix-2.18.1/install
+          install_url: https://releases.nixos.org/nix/nix-2.18.1/install
       - run: nix build .?submodules=1