From 578aef26740314b53d1d50e0099946817f9f2926 Mon Sep 17 00:00:00 2001
From: Gergely Nagy <me@gergo.csillger.hu>
Date: Sat, 19 Apr 2025 13:41:55 +0200
Subject: [PATCH 1/4] nix/build: Add grouping, and redirect output to stdout

Signed-off-by: Gergely Nagy <me@gergo.csillger.hu>
---
 build/bin/nix-build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/bin/nix-build b/build/bin/nix-build
index a02c178..4b777a3 100755
--- a/build/bin/nix-build
+++ b/build/bin/nix-build
@@ -8,5 +8,7 @@ case "${INPUT_LOGS}" in
         ;;
 esac
 
-nix build ${LOGS} --out-link "${INPUT_OUT_LINK}" "${INPUT_FLAKE}#${INPUT_PACKAGE}"
+echo "##[group]Building ${INPUT_PACKAGE}"
+nix build ${LOGS} --out-link "${INPUT_OUT_LINK}" "${INPUT_FLAKE}#${INPUT_PACKAGE}" 2>&1
 echo "output-path=$(readlink "${INPUT_OUT_LINK}")" >>"${GITHUB_OUTPUT}"
+echo "##[endgroup]"

From b383d262232ce1f1701867877cf50d2cc840635d Mon Sep 17 00:00:00 2001
From: Gergely Nagy <me@gergo.csillger.hu>
Date: Sat, 19 Apr 2025 13:45:46 +0200
Subject: [PATCH 2/4] ci: workflow updates

Signed-off-by: Gergely Nagy <me@gergo.csillger.hu>
---
 .forgejo/workflows/nix-build.yaml   |  2 +-
 .forgejo/workflows/nix-develop.yaml |  2 +-
 .forgejo/workflows/nix-shell.yaml   |  2 +-
 .forgejo/workflows/noop.yaml        | 13 -------------
 .forgejo/workflows/shellcheck.yaml  |  2 +-
 5 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 .forgejo/workflows/noop.yaml

diff --git a/.forgejo/workflows/nix-build.yaml b/.forgejo/workflows/nix-build.yaml
index 8f500d2..735a539 100644
--- a/.forgejo/workflows/nix-build.yaml
+++ b/.forgejo/workflows/nix-build.yaml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   nix/build:
-    runs-on: nixos-flakes
+    runs-on: nixos-latest
     steps:
       - name: checkout
         uses: actions/checkout@v3
diff --git a/.forgejo/workflows/nix-develop.yaml b/.forgejo/workflows/nix-develop.yaml
index a4d5b8f..be273c1 100644
--- a/.forgejo/workflows/nix-develop.yaml
+++ b/.forgejo/workflows/nix-develop.yaml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   nix/develop:
-    runs-on: nixos-flakes
+    runs-on: nixos-latest
     steps:
       - name: checkout
         uses: actions/checkout@v3
diff --git a/.forgejo/workflows/nix-shell.yaml b/.forgejo/workflows/nix-shell.yaml
index 4073121..a628303 100644
--- a/.forgejo/workflows/nix-shell.yaml
+++ b/.forgejo/workflows/nix-shell.yaml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   nix/shell:
-    runs-on: nixos-flakes
+    runs-on: nixos-latest
     steps:
       - name: checkout
         uses: actions/checkout@v3
diff --git a/.forgejo/workflows/noop.yaml b/.forgejo/workflows/noop.yaml
deleted file mode 100644
index 29b4582..0000000
--- a/.forgejo/workflows/noop.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-name: Nothing.
-
-on:
-  push:
-
-jobs:
-  nothing:
-    runs-on: nixos-flakes
-
-    steps:
-      - name: no-op
-        run: echo "This is only here to make Ironforge happy."
diff --git a/.forgejo/workflows/shellcheck.yaml b/.forgejo/workflows/shellcheck.yaml
index 3eb2700..e4d348e 100644
--- a/.forgejo/workflows/shellcheck.yaml
+++ b/.forgejo/workflows/shellcheck.yaml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   shellcheck:
-    runs-on: nixos-flakes
+    runs-on: nixos-latest
 
     steps:
       - name: checkout

From a110fcd4f6184c91dc99733b91b57fb5fd68fa12 Mon Sep 17 00:00:00 2001
From: Gergely Nagy <me@gergo.csillger.hu>
Date: Sat, 19 Apr 2025 13:49:17 +0200
Subject: [PATCH 3/4] build: Try a different redirect

Signed-off-by: Gergely Nagy <me@gergo.csillger.hu>
---
 build/bin/nix-build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/bin/nix-build b/build/bin/nix-build
index 4b777a3..8085c3e 100755
--- a/build/bin/nix-build
+++ b/build/bin/nix-build
@@ -8,7 +8,9 @@ case "${INPUT_LOGS}" in
         ;;
 esac
 
+exec 2>&1
+
 echo "##[group]Building ${INPUT_PACKAGE}"
-nix build ${LOGS} --out-link "${INPUT_OUT_LINK}" "${INPUT_FLAKE}#${INPUT_PACKAGE}" 2>&1
+nix build ${LOGS} --out-link "${INPUT_OUT_LINK}" "${INPUT_FLAKE}#${INPUT_PACKAGE}"
 echo "output-path=$(readlink "${INPUT_OUT_LINK}")" >>"${GITHUB_OUTPUT}"
 echo "##[endgroup]"

From cd059cf0c5e9cdba8e589ca7f748b49bd2db3672 Mon Sep 17 00:00:00 2001
From: Gergely Nagy <me@gergo.csillger.hu>
Date: Sat, 19 Apr 2025 13:50:39 +0200
Subject: [PATCH 4/4] nix-shell: Disable a failing test

This test is obsolete, the default environment includes gcc now.

Signed-off-by: Gergely Nagy <me@gergo.csillger.hu>
---
 .forgejo/workflows/nix-shell.yaml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.forgejo/workflows/nix-shell.yaml b/.forgejo/workflows/nix-shell.yaml
index a628303..16f7e81 100644
--- a/.forgejo/workflows/nix-shell.yaml
+++ b/.forgejo/workflows/nix-shell.yaml
@@ -23,19 +23,6 @@ jobs:
           run: |
             hello
 
-      - name: ensure we're not in a dev environment
-        uses: ./shell
-        with:
-          flake: ./shell/test
-          package: "hello"
-          run: |
-            set -x
-
-            # if we have gcc installed, we're in a dev environment.
-            # we don't want to be in a dev environment
-            type -p gcc >/dev/null && exit 1
-            hello
-
       - name: no commands should still work
         uses: ./shell
         with: