Merge pull request #50 from nixbuild/macos-14

Macos 14
nixbuild · Nov 5, 2024 · 6bd4191 · 6bd4191
2 parents 3cc323e + 828ea90
commit 6bd4191
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -44,6 +44,7 @@ jobs:
       matrix:
         os:
           - ubuntu-22.04
+          - macos-14
           - macos-13
         nix_version:
           - 2.24.9
@@ -89,6 +90,7 @@ jobs:
       matrix:
         os:
           - ubuntu-22.04
+          - macos-14
           - macos-13
         nix_version:
           - 2.24.9
@@ -135,6 +137,7 @@ jobs:
       matrix:
         os:
           - ubuntu-22.04
+          - macos-14
           - macos-13
         nix_version:
           - 2.24.9

diff --git a/nix-quick-install.sh b/nix-quick-install.sh
@@ -33,7 +33,8 @@ elif [[ "$sys" =~ .*-darwin ]]; then
   /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B &>/dev/null \
     || /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -t &>/dev/null \
     || echo "warning: failed to execute apfs.util"
-  diskutil apfs addVolume disk1 APFS nix -mountpoint /nix
+  diskutil apfs addVolume disk1 APFS nix -mountpoint /nix \
+    || diskutil apfs addVolume disk3 APFS nix -mountpoint /nix
   mdutil -i off /nix
   chown $USER /nix
 EOF