From a8ce1b651ec3ca634a8089b1b39f3616871c1c5d Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Tue, 19 Nov 2024 13:18:33 -0600
Subject: [PATCH] change update

---
 .github/workflows/update.yml | 58 +++++++++---------------------------
 othalan-current              |  1 -
 othalan-updated              |  1 -
 3 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 120000 othalan-current
 delete mode 120000 othalan-updated

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
index bc8f222..9f480b2 100644
--- a/.github/workflows/update.yml
+++ b/.github/workflows/update.yml
@@ -88,62 +88,32 @@ jobs:
 
       - name: Pre-build oizys
         run: nix build .
-      
-      # TODO: make this all oizys ci update --host
-      # to build / then build then write paths
-      - name: Build
+
+      - name: Build Current and Updated Systems
         run: >
           nix run .
-          --
-          build
-          "$(nix run . -- output --host,=othalan,algiz,mannaz,naudiz --flake .)"
+          -- 
+          ci update
+          --host,=othalan,algiz,mannaz,naudiz
           --flake .
           --debug
           --
-          --keep-going
-          --no-link
-
-      - run: git show origin/flake-lock:flake.lock > updated.lock
-
-      - name: Pre-build oizys
-        run: nix build . --reference-lock-file updated.lock
-
-      - name: Build Updated
-        run: >
-          nix run .
-          --
-          build
-          "$(nix run . -- output --host,=othalan,algiz,mannaz,naudiz --flake .)"
-          --flake .
-          --debug
-          --
-          --keep-going
-          --no-link
-          --reference-lock-file updated.lock
+          --quiet
 
       - run: |
           for host in othalan algiz mannaz naudiz; do
-            for rev in current updated; do
-              args="\"$(nix run . -- output --host $host)\" --out-link \"${host}-${rev}\""
-              [[ "$rev" == "updated" ]] && args="$args --reference-lock-file updated.lock"
-              nix build $args
-            done
+            echo "# System Diff" >> $GITHUB_STEP_SUMMARY
+            nix run "nixpkgs#nvd" -- --color always diff ./$host-current ./$host-updated >> $host-summary.md
+            printf '```\n%s\n```\n' "$(nix run "nixpkgs#nvd" -- diff ./$host-current ./$host-updated)" >> $GITHUB_STEP_SUMMARY
           done
 
-      - run: ls
-
-      # - run: |
-      #     echo "# System Diff" >> $GITHUB_STEP_SUMMARY
-      #     nix run "nixpkgs#nvd" -- --color always diff ./current ./updated >> summary.md
-      #     printf '```\n%s\n```\n' "$(nix run "nixpkgs#nvd" -- diff ./current ./updated)" >> $GITHUB_STEP_SUMMARY
-      #
       - run: df -h
 
-      # - uses: actions/upload-artifact@v4
-      #   with:
-      #     name: ${{ matrix.host }}-summary
-      #     path: summary.md
-      #
+      - uses: actions/upload-artifact@v4
+        with:
+          name: summary
+          path: '*-summary.md'
+
   build-full:
     needs: build-minimal
     runs-on: ubuntu-latest
diff --git a/othalan-current b/othalan-current
deleted file mode 120000
index 1927a71..0000000
--- a/othalan-current
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/pznxacprsq9gspmiavldyg1qfyppmqw4-nixos-system-othalan-25.05.20241118.5083ec8
\ No newline at end of file
diff --git a/othalan-updated b/othalan-updated
deleted file mode 120000
index 927fe81..0000000
--- a/othalan-updated
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/qx76kywiz9v85yxck9y64878v0an9q15-nixos-system-othalan-25.05.20241118.5083ec8
\ No newline at end of file